summaryrefslogtreecommitdiffstats
path: root/src/hooks
diff options
context:
space:
mode:
authorMarcin Siodelski <marcin@isc.org>2018-06-14 09:17:19 +0200
committerMarcin Siodelski <marcin@isc.org>2018-06-14 09:17:19 +0200
commit44d01581ce40fe80a8294e97670aafc1c6e40353 (patch)
treebfc1ade58dbbfa815427e366afe13a369ad56b48 /src/hooks
parent[5649] Ignore writes on exernal sockets. (diff)
downloadkea-44d01581ce40fe80a8294e97670aafc1c6e40353.tar.xz
kea-44d01581ce40fe80a8294e97670aafc1c6e40353.zip
Revert "[5649] IfaceMgr's select reacts on sending data over control channel."
This reverts commit 83f252d8cd26066e181fe3842f3db20e87001a48.
Diffstat (limited to 'src/hooks')
-rw-r--r--src/hooks/dhcp/high_availability/ha_service.cc14
-rw-r--r--src/hooks/dhcp/high_availability/ha_service.h2
2 files changed, 2 insertions, 14 deletions
diff --git a/src/hooks/dhcp/high_availability/ha_service.cc b/src/hooks/dhcp/high_availability/ha_service.cc
index cfef610f16..84cbf1511d 100644
--- a/src/hooks/dhcp/high_availability/ha_service.cc
+++ b/src/hooks/dhcp/high_availability/ha_service.cc
@@ -33,18 +33,6 @@ using namespace isc::http;
using namespace isc::log;
using namespace isc::util;
-namespace {
-
-/// @brief Timeout for synchronization of leases with partner.
-///
-/// This timeout is very high because in some cases the number of
-/// gathered leases is huge. Syncing should not really take that
-/// long, but if the partner doesn't respond we can't do anything
-/// useful anyway. So, it doesn't really matter.
-const long HA_SYNC_TIMEOUT = 60000;
-
-}
-
namespace isc {
namespace ha {
@@ -1227,7 +1215,7 @@ HAService::asyncSyncLeases(http::HttpClient& http_client,
post_sync_action(error_message.empty(),
error_message);
}
- }, HttpClient::RequestTimeout(HA_SYNC_TIMEOUT));
+ });
}
ConstElementPtr
diff --git a/src/hooks/dhcp/high_availability/ha_service.h b/src/hooks/dhcp/high_availability/ha_service.h
index 5d6325a120..bff04ca006 100644
--- a/src/hooks/dhcp/high_availability/ha_service.h
+++ b/src/hooks/dhcp/high_availability/ha_service.h
@@ -540,7 +540,7 @@ protected:
///
/// If there is an error while inserting or updating any of the leases
/// a warning message is logged and the process continues for the
- /// remaining leases. The timeout for synchronization is set to 1 minute.
+ /// remaining leases.
///
/// @param http_client reference to the client to be used to communicate
/// with the other server.