mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 14:05:33 +00:00
Code Issues Releases Wiki Activity

[#1087] Tracking all connecting clients

Browse Source 
The HA lib now tracks all clients trying to connect to the partner server
when the communication is interrupted. It is possible see how many clients
have been trying so far. The unacked clients are tracked separately.
This commit is contained in:
Marcin Siodelski
2020-05-15 14:33:20 +02:00
parent 28e56631cb
commit 02f17f4a46
3 changed files with 64 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/hooks/dhcp/high_availability/communication_state.cc
View File

@@ -313,7 +313,7 @@ CommunicationState4::analyzeMessage(const boost::shared_ptr<dhcp::Pkt>& message)
auto& idx = connecting_clients_.get<0>();
auto existing_request = idx.find(boost::make_tuple(msg->getHWAddr()->hwaddr_, client_id));
if (existing_request != idx.end()) {
// If the client was recorded but was not considered unacked
// If the client was recorded and was not considered unacked
// but it should be considered unacked as a result of processing
// this packet, let's update the recorded request to mark the
// client unacked.
@@ -336,6 +336,11 @@ CommunicationState4::failureDetected() const {
(getUnackedClientsCount() > config_->getMaxUnackedClients()));
}
size_t
CommunicationState4::getConnectingClientsCount() const {
return (connecting_clients_.size());
}
size_t
CommunicationState4::getUnackedClientsCount() const {
return (connecting_clients_.get<1>().count(true));
@@ -378,7 +383,7 @@ CommunicationState6::analyzeMessage(const boost::shared_ptr<dhcp::Pkt>& message)
auto& idx = connecting_clients_.get<0>();
auto existing_request = idx.find(duid->getData());
if (existing_request != idx.end()) {
// If the client was recorded but was not considered unacked
// If the client was recorded and was not considered unacked
// but it should be considered unacked as a result of processing
// this packet, let's update the recorded request to mark the
// client unacked.
@@ -400,6 +405,11 @@ CommunicationState6::failureDetected() const {
(getUnackedClientsCount() > config_->getMaxUnackedClients()));
}
size_t
CommunicationState6::getConnectingClientsCount() const {
return (connecting_clients_.size());
}
size_t
CommunicationState6::getUnackedClientsCount() const {
return (connecting_clients_.get<1>().count(true));

30
src/hooks/dhcp/high_availability/communication_state.h
View File

@@ -227,6 +227,16 @@ public:
/// otherwise.
virtual bool failureDetected() const = 0;
/// @brief Returns the current number of clients which attempted
/// to get the lease from the partner server.
///
/// The returned number is reset to 0 when the server successfully
/// establishes communication with the partner. The number is
/// incremented only in the communications interrupted case.
///
/// @return The number of clients including unacked clients.
virtual size_t getConnectingClientsCount() const = 0;
/// @brief Returns the current number of clients which haven't got
/// the lease from the partner server.
///
@@ -412,6 +422,16 @@ public:
/// otherwise.
virtual bool failureDetected() const;
/// @brief Returns the current number of clients which attempted
/// to get the lease from the partner server.
///
/// The returned number is reset to 0 when the server successfully
/// establishes communication with the partner. The number is
/// incremented only in the communications interrupted case.
///
/// @return The number of clients including unacked clients.
virtual size_t getConnectingClientsCount() const;
/// @brief Returns the current number of clients which haven't got
/// the lease from the partner server.
///
@@ -504,6 +524,16 @@ public:
/// otherwise.
virtual bool failureDetected() const;
/// @brief Returns the current number of clients which attempted
/// to get the lease from the partner server.
///
/// The returned number is reset to 0 when the server successfully
/// establishes communication with the partner. The number is
/// incremented only in the communications interrupted case.
///
/// @return The number of clients including unacked clients.
virtual size_t getConnectingClientsCount() const;
/// @brief Returns the current number of clients which haven't got
/// the lease from the partner server.
///

27
src/hooks/dhcp/high_availability/tests/communication_state_unittest.cc
View File

@@ -190,6 +190,7 @@ TEST_F(CommunicationStateTest, detectFailureV4) {
// Initially, there should be no unacked clients recorded.
ASSERT_FALSE(state_.failureDetected());
EXPECT_EQ(0, state_.getUnackedClientsCount());
EXPECT_EQ(0, state_.getConnectingClientsCount());
EXPECT_EQ(0, state_.getAnalyzedMessagesCount());
// The maximum number of unacked clients is 10. Let's provide 10
@@ -210,6 +211,7 @@ TEST_F(CommunicationStateTest, detectFailureV4) {
<< static_cast<int>(i);
}
EXPECT_EQ(10, state_.getUnackedClientsCount());
EXPECT_EQ(10, state_.getConnectingClientsCount());
EXPECT_EQ(10, state_.getAnalyzedMessagesCount());
// Let's provide similar set of requests but this time the "secs" field is
@@ -223,15 +225,17 @@ TEST_F(CommunicationStateTest, detectFailureV4) {
<< static_cast<int>(i);
}
EXPECT_EQ(10, state_.getUnackedClientsCount());
EXPECT_EQ(15, state_.getConnectingClientsCount());
EXPECT_EQ(20, state_.getAnalyzedMessagesCount());
// Let's create a message from a new (not recorded yet) client with the
// "secs" field value below the threshold. It should not be recorded.
// "secs" field value below the threshold. It should not be counted as failure.
ASSERT_NO_THROW(state_.analyzeMessage(createMessage4(DHCPDISCOVER, 10, 10, 6)));
// Still no failure.
ASSERT_FALSE(state_.failureDetected());
EXPECT_EQ(10, state_.getUnackedClientsCount());
EXPECT_EQ(16, state_.getConnectingClientsCount());
EXPECT_EQ(21, state_.getAnalyzedMessagesCount());
// Let's repeat one of the requests which already have been recorded as
@@ -239,6 +243,8 @@ TEST_F(CommunicationStateTest, detectFailureV4) {
// be counted because only new clients count.
ASSERT_NO_THROW(state_.analyzeMessage(createMessage4(DHCPDISCOVER, 3, 3, 20)));
ASSERT_FALSE(state_.failureDetected());
EXPECT_EQ(10, state_.getUnackedClientsCount());
EXPECT_EQ(16, state_.getConnectingClientsCount());
EXPECT_EQ(22, state_.getAnalyzedMessagesCount());
// This time let's simulate a client with a MAC address already recorded but
@@ -246,6 +252,7 @@ TEST_F(CommunicationStateTest, detectFailureV4) {
ASSERT_NO_THROW(state_.analyzeMessage(createMessage4(DHCPDISCOVER, 7, 7, 15)));
ASSERT_TRUE(state_.failureDetected());
EXPECT_EQ(11, state_.getUnackedClientsCount());
EXPECT_EQ(16, state_.getConnectingClientsCount());
EXPECT_EQ(23, state_.getAnalyzedMessagesCount());
// Poking should cause all counters to reset as it is an indication that the
@@ -255,6 +262,7 @@ TEST_F(CommunicationStateTest, detectFailureV4) {
// We're back to no failure state.
EXPECT_FALSE(state_.failureDetected());
EXPECT_EQ(0, state_.getUnackedClientsCount());
EXPECT_EQ(0, state_.getConnectingClientsCount());
EXPECT_EQ(0, state_.getAnalyzedMessagesCount());
// Send 11 DHCPDISCOVER messages with the "secs" field bytes swapped. Swapping
@@ -271,6 +279,7 @@ TEST_F(CommunicationStateTest, detectFailureV4) {
<< " when testing swapped secs field bytes";
}
EXPECT_EQ(0, state_.getUnackedClientsCount());
EXPECT_EQ(11, state_.getConnectingClientsCount());
EXPECT_EQ(11, state_.getAnalyzedMessagesCount());
// Repeat the same test, but this time either the first byte exceeds the
@@ -291,6 +300,7 @@ TEST_F(CommunicationStateTest, detectFailureV4) {
0x30)));
EXPECT_TRUE(state_.failureDetected());
EXPECT_EQ(11, state_.getUnackedClientsCount());
EXPECT_EQ(12, state_.getConnectingClientsCount());
EXPECT_EQ(22, state_.getAnalyzedMessagesCount());
}
@@ -307,6 +317,7 @@ TEST_F(CommunicationStateTest, detectFailureV6) {
// Initially, there should be no unacked clients recorded.
ASSERT_FALSE(state6_.failureDetected());
EXPECT_EQ(0, state6_.getUnackedClientsCount());
EXPECT_EQ(0, state6_.getConnectingClientsCount());
EXPECT_EQ(0, state6_.getAnalyzedMessagesCount());
// The maximum number of unacked clients is 10. Let's provide 10
@@ -324,11 +335,12 @@ TEST_F(CommunicationStateTest, detectFailureV6) {
<< static_cast<int>(i);
}
EXPECT_EQ(10, state6_.getUnackedClientsCount());
EXPECT_EQ(10, state6_.getConnectingClientsCount());
EXPECT_EQ(10, state6_.getAnalyzedMessagesCount());
// Let's provide similar set of requests but this time the "elapsed time" is
// below the threshold. They should not be counted as failures. Also,
// all of these requests have client identifier.
// below the threshold. This should not reduce the number of unacked or new
// clients.
for (uint8_t i = 0; i < 10; ++i) {
ASSERT_NO_THROW(state6_.analyzeMessage(createMessage6(DHCPV6_SOLICIT, i,
900)));
@@ -337,15 +349,17 @@ TEST_F(CommunicationStateTest, detectFailureV6) {
<< static_cast<int>(i);
}
EXPECT_EQ(10, state6_.getUnackedClientsCount());
EXPECT_EQ(10, state6_.getConnectingClientsCount());
EXPECT_EQ(20, state6_.getAnalyzedMessagesCount());
// Let's create a message from a new (not recorded yet) client with the
// "elapsed time" value below the threshold. It should not be recorded.
// "elapsed time" value below the threshold. It should not count as failure.
ASSERT_NO_THROW(state6_.analyzeMessage(createMessage6(DHCPV6_SOLICIT, 10, 600)));
// Still no failure.
ASSERT_FALSE(state6_.failureDetected());
EXPECT_EQ(10, state6_.getUnackedClientsCount());
EXPECT_EQ(11, state6_.getConnectingClientsCount());
EXPECT_EQ(21, state6_.getAnalyzedMessagesCount());
// Let's repeat one of the requests which already have been recorded as
@@ -354,12 +368,14 @@ TEST_F(CommunicationStateTest, detectFailureV6) {
ASSERT_NO_THROW(state6_.analyzeMessage(createMessage6(DHCPV6_SOLICIT, 3, 2000)));
ASSERT_FALSE(state6_.failureDetected());
EXPECT_EQ(10, state6_.getUnackedClientsCount());
EXPECT_EQ(11, state6_.getConnectingClientsCount());
EXPECT_EQ(22, state6_.getAnalyzedMessagesCount());
// New unacked client should cause failure to the detected.
// New unacked client should cause failure to be detected.
ASSERT_NO_THROW(state6_.analyzeMessage(createMessage6(DHCPV6_SOLICIT, 11, 1500)));
ASSERT_TRUE(state6_.failureDetected());
EXPECT_EQ(11, state6_.getUnackedClientsCount());
EXPECT_EQ(12, state6_.getConnectingClientsCount());
EXPECT_EQ(23, state6_.getAnalyzedMessagesCount());
// Poking should cause all counters to reset as it is an indication that the
@@ -369,6 +385,7 @@ TEST_F(CommunicationStateTest, detectFailureV6) {
// We're back to no failure state.
EXPECT_FALSE(state6_.failureDetected());
EXPECT_EQ(0, state6_.getUnackedClientsCount());
EXPECT_EQ(0, state6_.getConnectingClientsCount());
EXPECT_EQ(0, state6_.getAnalyzedMessagesCount());
}