From: Thomas Markwalder <tmark@isc.org>
Date: Thu, 22 Apr 2021 20:05:48 +0000 (-0400)
Subject: [#1736] More review comments
X-Git-Tag: Kea-1.9.7~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=861bdcbafa5b1053e823d35caa6a959ee8a943a3;p=thirdparty%2Fkea.git

[#1736] More review comments

    Cosmetics.
---

diff --git a/src/hooks/dhcp/high_availability/communication_state.h b/src/hooks/dhcp/high_availability/communication_state.h
index 1fd27d9559..0296c75048 100644
--- a/src/hooks/dhcp/high_availability/communication_state.h
+++ b/src/hooks/dhcp/high_availability/communication_state.h
@@ -289,8 +289,8 @@ protected:
 
 public:
 
-    /// @brief Indicates whether the HA service should issue a warning about
-    /// high clock skew between the active servers.
+    /// @brief Issues a warning about high clock skew between the active
+    /// servers if one is warranted.
     ///
     /// The HA service monitors the clock skew between the active servers. The
     /// clock skew is calculated from the local time and the time returned by
@@ -314,8 +314,8 @@ public:
     bool clockSkewShouldWarn();
 
 private:
-    /// @brief Indicates whether the HA service and issues a warning about
-    /// high clock skew between the active servers if warranted.
+    /// @brief Issues a warning about high clock skew between the active
+    /// servers if one is warranted.
     ///
     /// The HA service monitors the clock skew between the active servers. The
     /// clock skew is calculated from the local time and the time returned by
@@ -376,8 +376,6 @@ private:
     /// @return true if the HA service should enter "terminated" state.
     bool clockSkewShouldTerminateInternal() const;
 
-//protected:
-
     /// @brief Checks if the clock skew is greater than the specified number
     /// of seconds.
     ///
diff --git a/src/hooks/dhcp/high_availability/tests/ha_mt_unittest.cc b/src/hooks/dhcp/high_availability/tests/ha_mt_unittest.cc
index 5f5e00b899..a2e62945da 100644
--- a/src/hooks/dhcp/high_availability/tests/ha_mt_unittest.cc
+++ b/src/hooks/dhcp/high_availability/tests/ha_mt_unittest.cc
@@ -157,7 +157,7 @@ TEST_F(HAMtServiceTest, multiThreadingStartup) {
         bool dhcp_mt_enabled_;          // True if DHCP multi-threading is enabled.
         uint32_t dhcp_threads_;         // Value of DHCP thread-pool-size.
         bool exp_ha_mt_enabled_;        // If HA+MT should be enabled
-        bool exp_listener_;             // if HA+MT should use dedicated listener.
+        bool exp_listener_;             // If HA+MT should use dedicated listener.
         uint32_t exp_listener_threads_; // Expected number of listener threads.
         uint32_t exp_client_threads_;   // Expected number of client threads.
     };
@@ -184,22 +184,22 @@ TEST_F(HAMtServiceTest, multiThreadingStartup) {
             !ha_mt, !listener, 0, 0
         },
         {
-            "3 dhcp mt disabled, mt enabled",
+            "3 dhcp mt disabled, ha mt enabled",
             makeHAMtJson(ha_mt, listener, 0, 0),
             !dhcp_mt, 4,
             !ha_mt, !listener, 0, 0
         },
         {
-            "4 dhcp mt enabled, mt enabled, listener disabled",
+            "4 dhcp mt enabled, ha mt enabled, listener disabled",
             makeHAMtJson(ha_mt, !listener, 0, 0),
             dhcp_mt, 4,
             ha_mt, !listener, 4, 4
         },
         {
-            "5 dhcp mt enabled, mt enabled, listener enabled",
-            makeHAMtJson(ha_mt, !listener, 0, 0),
+            "5 dhcp mt enabled, ha mt enabled, listener enabled",
+            makeHAMtJson(ha_mt, listener, 0, 0),
             dhcp_mt, 4,
-            ha_mt, !listener, 4, 4
+            ha_mt, listener, 4, 4
         },
         {
             "6 explicit DHCP threads, explicit thread values",