Commit 782fdf35 authored by Marcin Siodelski's avatar Marcin Siodelski
Browse files

[#173,!154] reconnect-wait-time is now in milliseconds.

parent 532c0fd5
...@@ -496,13 +496,14 @@ recovery and the server will exit immediately upon detecting a loss of connectiv ...@@ -496,13 +496,14 @@ recovery and the server will exit immediately upon detecting a loss of connectiv
(MySQL and Postgres only). (MySQL and Postgres only).
</para> </para>
<para> <para>
The number of seconds the server will wait in between attempts to reconnect to the The number of milliseconds the server will wait in between attempts to reconnect to the
lease database after connectivity has been lost may also be specified: lease database after connectivity has been lost may also be specified:
<screen> <screen>
"Dhcp4": { "lease-database": { <userinput>"reconnect-wait-time" : <replaceable>number-of-seconds</replaceable></userinput>, ... }, ... } "Dhcp4": { "lease-database": { <userinput>"reconnect-wait-time" : <replaceable>number-of-milliseconds</replaceable></userinput>, ... }, ... }
</screen> </screen>
A value of zero (the default) disables automatic recovery and the server will exit The default value for MySQL and Postgres is 0, which disables automatic recovery and
immediately upon detecting a loss of connectivity (MySQL and Postgres only). causes the server to exit immediately upon detecting the loss of connectivity.
The default value for Cassandra is 2000 ms.
</para> </para>
<para>Finally, the credentials of the account under which the server will <para>Finally, the credentials of the account under which the server will
access the database should be set: access the database should be set:
...@@ -662,13 +663,14 @@ recovery and the server will exit immediately upon detecting a loss of connectiv ...@@ -662,13 +663,14 @@ recovery and the server will exit immediately upon detecting a loss of connectiv
(MySQL and Postgres only). (MySQL and Postgres only).
</para> </para>
<para> <para>
The number of seconds the server will wait in between attempts to reconnect to the The number of milliseconds the server will wait in between attempts to reconnect to the
host database after connectivity has been lost may also be specified: host database after connectivity has been lost may also be specified:
<screen> <screen>
"Dhcp4": { "hosts-database": { <userinput>"reconnect-wait-time" : <replaceable>number-of-seconds</replaceable></userinput>, ... }, ... } "Dhcp4": { "hosts-database": { <userinput>"reconnect-wait-time" : <replaceable>number-of-milliseconds</replaceable></userinput>, ... }, ... }
</screen> </screen>
A value of zero (the default) disables automatic recovery and the server will exit The default value for MySQL and Postgres is 0, which disables automatic recovery and
immediately upon detecting a loss of connectivity (MySQL and Postgres only). causes the server to exit immediately upon detecting the loss of connectivity.
The default value for Cassandra is 2000 ms.
</para> </para>
</para> </para>
......
...@@ -493,13 +493,14 @@ recovery and the server will exit immediately upon detecting a loss of connectiv ...@@ -493,13 +493,14 @@ recovery and the server will exit immediately upon detecting a loss of connectiv
(MySQL and Postgres only). (MySQL and Postgres only).
</para> </para>
<para> <para>
The number of seconds the server will wait in between attempts to reconnect to the The number of milliseconds the server will wait in between attempts to reconnect to the
lease database after connectivity has been lost may also be specified: lease database after connectivity has been lost may also be specified:
<screen> <screen>
"Dhcp6": { "lease-database": { <userinput>"reconnect-wait-time" : <replaceable>number-of-seconds</replaceable></userinput>, ... }, ... } "Dhcp6": { "lease-database": { <userinput>"reconnect-wait-time" : <replaceable>number-of-milliseconds</replaceable></userinput>, ... }, ... }
</screen> </screen>
A value of zero (the default) disables automatic recovery and the server will exit The default value for MySQL and Postgres is 0, which disables automatic recovery and
immediately upon detecting a loss of connectivity (MySQL and Postgres only). causes the server to exit immediately upon detecting the loss of connectivity.
The default value for Cassandra is 2000 ms.
</para> </para>
<para> <para>
Note that host parameter is used by MySQL and PostgreSQL Note that host parameter is used by MySQL and PostgreSQL
...@@ -599,13 +600,14 @@ recovery and the server will exit immediately upon detecting a loss of connectiv ...@@ -599,13 +600,14 @@ recovery and the server will exit immediately upon detecting a loss of connectiv
(MySQL and Postgres only). (MySQL and Postgres only).
</para> </para>
<para> <para>
The number of seconds the server will wait in between attempts to reconnect to the The number of milliseconds the server will wait in between attempts to reconnect to the
host database after connectivity has been lost may also be specified: host database after connectivity has been lost may also be specified:
<screen> <screen>
"Dhcp6": { "hosts-database": { <userinput>"reconnect-wait-time" : <replaceable>number-of-seconds</replaceable></userinput>, ... }, ... } "Dhcp6": { "hosts-database": { <userinput>"reconnect-wait-time" : <replaceable>number-of-milliseconds</replaceable></userinput>, ... }, ... }
</screen> </screen>
A value of zero (the default) disables automatic recovery and the server will exit The default value for MySQL and Postgres is 0, which disables automatic recovery and
immediately upon detecting a loss of connectivity (MySQL and Postgres only). causes the server to exit immediately upon detecting the loss of connectivity.
The default value for Cassandra is 2000 ms.
</para> </para>
<para>Finally, the credentials of the account under which the server will <para>Finally, the credentials of the account under which the server will
access the database should be set: access the database should be set:
......
...@@ -904,7 +904,7 @@ ControlledDhcpv4Srv::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) { ...@@ -904,7 +904,7 @@ ControlledDhcpv4Srv::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) {
TimerMgr::instance()->registerTimer("Dhcp4DbReconnectTimer", TimerMgr::instance()->registerTimer("Dhcp4DbReconnectTimer",
boost::bind(&ControlledDhcpv4Srv::dbReconnect, this, boost::bind(&ControlledDhcpv4Srv::dbReconnect, this,
db_reconnect_ctl), db_reconnect_ctl),
db_reconnect_ctl->retryInterval() * 1000, db_reconnect_ctl->retryInterval(),
asiolink::IntervalTimer::ONE_SHOT); asiolink::IntervalTimer::ONE_SHOT);
} }
......
...@@ -158,7 +158,7 @@ An error message indicating that an attempt to reconnect to the lease and/or ...@@ -158,7 +158,7 @@ An error message indicating that an attempt to reconnect to the lease and/or
host data bases has failed. This occurs after connectivity to either one host data bases has failed. This occurs after connectivity to either one
has been lost and an automatic attempt to reconnect has failed. has been lost and an automatic attempt to reconnect has failed.
% DHCP4_DB_RECONNECT_ATTEMPT_SCHEDULE scheduling attempt %1 of %2 in %3 seconds % DHCP4_DB_RECONNECT_ATTEMPT_SCHEDULE scheduling attempt %1 of %2 in %3 milliseconds
An informational message indicating that the server is scheduling the next An informational message indicating that the server is scheduling the next
attempt to reconnect to its lease and/or host databases. This occurs when the attempt to reconnect to its lease and/or host databases. This occurs when the
server has lost databse connectivity and is attempting to reconnect server has lost databse connectivity and is attempting to reconnect
......
...@@ -924,7 +924,7 @@ ControlledDhcpv6Srv::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) { ...@@ -924,7 +924,7 @@ ControlledDhcpv6Srv::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) {
TimerMgr::instance()->registerTimer("Dhcp6DbReconnectTimer", TimerMgr::instance()->registerTimer("Dhcp6DbReconnectTimer",
boost::bind(&ControlledDhcpv6Srv::dbReconnect, this, boost::bind(&ControlledDhcpv6Srv::dbReconnect, this,
db_reconnect_ctl), db_reconnect_ctl),
db_reconnect_ctl->retryInterval() * 1000, db_reconnect_ctl->retryInterval(),
asiolink::IntervalTimer::ONE_SHOT); asiolink::IntervalTimer::ONE_SHOT);
} }
......
...@@ -118,7 +118,7 @@ An error message indicating that an attempt to reconnect to the lease and/or ...@@ -118,7 +118,7 @@ An error message indicating that an attempt to reconnect to the lease and/or
host data bases has failed. This occurs after connectivity to either one host data bases has failed. This occurs after connectivity to either one
has been lost and an automatic attempt to reconnect has failed. has been lost and an automatic attempt to reconnect has failed.
% DHCP6_DB_RECONNECT_ATTEMPT_SCHEDULE scheduling attempt %1 of %2 in %3 seconds % DHCP6_DB_RECONNECT_ATTEMPT_SCHEDULE scheduling attempt %1 of %2 in %3 milliseconds
An informational message indicating that the server is scheduling the next An informational message indicating that the server is scheduling the next
attempt to reconnect to its lease and/or host databases. This occurs when the attempt to reconnect to its lease and/or host databases. This occurs when the
server has lost databse connectivity and is attempting to reconnect server has lost databse connectivity and is attempting to reconnect
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment