From: Marcin Siodelski Date: Sun, 7 Apr 2024 06:50:39 +0000 (+0200) Subject: [#3250] Corrected typos after code review X-Git-Tag: Kea-2.5.8~77 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58508ac26ec3c71a3725ab13f03a3b208ceccfa3;p=thirdparty%2Fkea.git [#3250] Corrected typos after code review --- diff --git a/ChangeLog b/ChangeLog index 377df2df8f..f852fd552d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,10 @@ 2218. [func] marcin Addressed an inconsistent state of the High Availability - service in case one of the terminated services is restarted - and another one is not. The restarted service waits 10 - minutes for the partner restart. If the partner is not - restarted the service transitions to the terminated state - to continue responding to the DHCP traffic. + service that occurs when one of the terminated services is + restarted and another one is not. The restarted service waits 10 + minutes for the partner restart. If the partner is not restarted + the service transitions to the terminated state to continue + responding to the DHCP traffic. (Gitlab #3250) 2217. [func] fdupont diff --git a/src/hooks/dhcp/high_availability/ha_messages.mes b/src/hooks/dhcp/high_availability/ha_messages.mes index 7611ec87ee..4da6bf0a68 100644 --- a/src/hooks/dhcp/high_availability/ha_messages.mes +++ b/src/hooks/dhcp/high_availability/ha_messages.mes @@ -753,7 +753,7 @@ database and start normal operation. % HA_TERMINATED_PARTNER_DID_NOT_RESTART %1: service is terminating because the terminated partner was not restarted within %2 minutes This warning message is issued to indicate that the HA service is terminating because partner server is in the terminated state and was not restarted within -an expacted time frame. The terminated servers should be restarted after correcting +an expected time frame. The terminated servers should be restarted after correcting the problem that caused the termination. They can be restarted sequentially but the duration between the restarts should not be too long. If it is long it may mean that the restart of one of the servers was unintentional (e.g., power outage). If the diff --git a/src/hooks/dhcp/high_availability/tests/communication_state_unittest.cc b/src/hooks/dhcp/high_availability/tests/communication_state_unittest.cc index 19ccc58e08..149e5a0db9 100644 --- a/src/hooks/dhcp/high_availability/tests/communication_state_unittest.cc +++ b/src/hooks/dhcp/high_availability/tests/communication_state_unittest.cc @@ -65,11 +65,11 @@ public: /// tested in a different test case. void partnerStateUnavailableTest(); - /// @brief Verifies that the duration since the partner time is updated + /// @brief Verifies that the duration since the partner state time is updated /// correctly when the partner has certain state. void partnerStateTimeExplicitStateTest(); - /// @brief Verifies that the duration since the partner time is updated + /// @brief Verifies that the duration since the partner state time is updated /// correctly when the partner is unavailable. void partnerStateTimeUnavailableTest(); @@ -216,7 +216,7 @@ CommunicationStateTest::partnerStateTest() { EXPECT_THROW(state_.setPartnerState("unsupported"), BadValue); } -// Verifies that the duration since the partner time is updated +// Verifies that the duration since the partner state time is updated // correctly when the partner has certain state. void CommunicationStateTest::partnerStateTimeExplicitStateTest() { @@ -245,7 +245,7 @@ CommunicationStateTest::partnerStateTimeExplicitStateTest() { EXPECT_LT(duration_since_waiting.seconds(), 10); } -// Verifies that the duration since the partner time is updated +// Verifies that the duration since the partner state time is updated // correctly when the partner is unavailable. void CommunicationStateTest::partnerStateTimeUnavailableTest() {