[master] Merge branch 'trac4075'

diff --cc src/lib/dhcpsrv/alloc_engine_messages.mes
index 885f9e273e7cc87b04ffc19ec981419ecc280b7b,7270b920227524fea2d43bab48af2351f5729026..2bc641e322da8a0649a5669a46cf822e503d1456
--- 1/src/lib/dhcpsrv/alloc_engine_messages.mes
--- 2/src/lib/dhcpsrv/alloc_engine_messages.mes
+++ b/src/lib/dhcpsrv/alloc_engine_messages.mes
@@@ -90,23 -83,7 +90,23 @@@ the number of reclaimed leases may als
  value, configured with 'max-reclaim-time'. The message includes the
  number of reclaimed leases and the total time.
  
- % ALLOC_ENGINE_V4_LEASES_RECLAMATION_START starting reclamation of expired leases (limit = %1 leases or %2 seconds)
 +% ALLOC_ENGINE_V4_LEASES_RECLAMATION_SLOW expired leases still exist after %1 reclamations
 +This warning message is issued when the server has been unable to
 +reclaim all expired leases in a specified number of consecutive
 +attempts. This indicates that the value of "reclaim-timer-wait-time"
 +may be too high. However, if this is just a short burst of leases'
 +expirations the value does not have to be modified and the server
 +should deal with this in subsequent reclamation attempts. If this
 +is a result of a permanent increase of the server load, the value
 +of "reclaim-timer-wait-time" should be decreased, or the
 +values of "max-reclaim-leases" and "max-reclaim-time" should be
 +increased to allow processing more leases in a single cycle.
 +Alternatively, these values may be set to 0 to remove the
 +limitations on the number of leases and duration. However, this
 +may result in longer periods of server's unresponsiveness to
 +DHCP packets, while it processes the expired leases.
 +
+ % ALLOC_ENGINE_V4_LEASES_RECLAMATION_START starting reclamation of expired leases (limit = %1 leases or %2 milliseconds)
  This debug message is issued when the allocation engine starts the
  reclamation of the expired leases. The maximum number of leases to
  be reclaimed and the timeout is included in the message. If any of
@@@ -355,23 -309,7 +355,23 @@@ the number of reclaimed leases may als
  value, configured with 'max-reclaim-time'. The message includes the
  number of reclaimed leases and the total time.
  
- % ALLOC_ENGINE_V6_LEASES_RECLAMATION_START starting reclamation of expired leases (limit = %1 leases or %2 seconds)
 +% ALLOC_ENGINE_V6_LEASES_RECLAMATION_SLOW expired leases still exist after %1 reclamations
 +This warning message is issued when the server has been unable to
 +reclaim all expired leases in a specified number of consecutive
 +attempts. This indicates that the value of "reclaim-timer-wait-time"
 +may be too high. However, if this is just a short burst of leases'
 +expirations the value does not have to be modified and the server
 +should deal with this in subsequent reclamation attempts. If this
 +is a result of a permanent increase of the server load, the value
 +of "reclaim-timer-wait-time" should be decreased, or the
 +values of "max-reclaim-leases" and "max-reclaim-time" should be
 +increased to allow processing more leases in a single cycle.
 +Alternatively, these values may be set to 0 to remove the
 +limitations on the number of leases and duration. However, this
 +may result in longer periods of server's unresponsiveness to
 +DHCP packets, while it processes the expired leases.
 +
+ % ALLOC_ENGINE_V6_LEASES_RECLAMATION_START starting reclamation of expired leases (limit = %1 leases or %2 milliseconds)
  This debug message is issued when the allocation engine starts the
  reclamation of the expired leases. The maximum number of leases to
  be reclaimed and the timeout is included in the message. If any of

diff --cc src/lib/dhcpsrv/tests/alloc_engine_expiration_unittest.cc
Simple merge