[#3019] updated documentation and added ChangeLog entry

5 files changed, 26 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ee05c7da8..36f92f4f70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2197.	[func]		razvan
+	Added support for database connection retry on server startup.
+	The new 'retry-on-startup' parameter controls this behavior along
+	with the other existing parameters: 'on-fail',
+	'max-reconnect-tries' and 'reconnect-wait-time'.
+	(Gitlab #3019)
+
 2196.	[func]		tmark
 	The ping-check hook library can now be used with kea-dhcp4
 	in either multi-threaded or single-threaded mode.
diff --git a/doc/sphinx/arm/database-connectivity.rst b/doc/sphinx/arm/database-connectivity.rst
index d470c34002..2d4e2f5217 100644
--- a/doc/sphinx/arm/database-connectivity.rst
+++ b/doc/sphinx/arm/database-connectivity.rst
@@ -23,6 +23,10 @@ system allows nanny scripts to detect the problem.
 If ``retry-on-startup`` is set to ``true``, the server will start reconnection
 attempts even at server startup or on reconfigure events, and will honor the
 action specified in the ``on-fail`` parameter.
+Database connection retries are not attempted on startup if the
+:ischooklib:`libdhcp_limits.so` is loaded because the hook library requires a
+valid connection to the database to check if JSON format is supported and to
+recount class limits.
 
 During dynamic reconfiguration, all backends are disconnected and then
 reconnected using the new configuration. If connectivity to any of the
diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst
index 307c488cfe..0edf138aba 100644
--- a/doc/sphinx/arm/dhcp4-srv.rst
+++ b/doc/sphinx/arm/dhcp4-srv.rst
@@ -825,6 +825,10 @@ system allows nanny scripts to detect the problem.
 If ``retry-on-startup`` is set to ``true``, the server will start reconnection
 attempts even at server startup or on reconfigure events, and will honor the
 action specified in the ``on-fail`` parameter.
+Database connection retries are not attempted on startup if the
+:ischooklib:`libdhcp_limits.so` is loaded because the hook library requires a
+valid connection to the database to check if JSON format is supported and to
+recount class limits.
 
 Finally, the credentials of the account under which the server will
 access the database should be set:
diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst
index 9c19b1460d..bb81b7e250 100644
--- a/doc/sphinx/arm/dhcp6-srv.rst
+++ b/doc/sphinx/arm/dhcp6-srv.rst
@@ -781,6 +781,10 @@ system allows nanny scripts to detect the problem.
 If ``retry-on-startup`` is set to ``true``, the server will start reconnection
 attempts even at server startup or on reconfigure events, and will honor the
 action specified in the ``on-fail`` parameter.
+Database connection retries are not attempted on startup if the
+:ischooklib:`libdhcp_limits.so` is loaded because the hook library requires a
+valid connection to the database to check if JSON format is supported and to
+recount class limits.
 
 Finally, the credentials of the account under which the server will
 access the database should be set:
diff --git a/doc/sphinx/arm/hooks-limits.rst b/doc/sphinx/arm/hooks-limits.rst
index 73c6d2773b..42bb39a0d0 100644
--- a/doc/sphinx/arm/hooks-limits.rst
+++ b/doc/sphinx/arm/hooks-limits.rst
@@ -117,6 +117,13 @@ This is how a lease limit is defined for a subnet inside a shared network:
     respective client class or subnet. To reset the lease count, change the client class name
     or the subnet ID.
 
+.. note::
+
+    Database connection retries are not attempted on startup if the
+    :ischooklib:`libdhcp_limits.so` is loaded because the hook library requires a
+    valid connection to the database to check if JSON format is supported and to
+    recount class limits.
+
 .. _hooks-limits-lease-limiting:
 
 Lease Limiting