Add TCP_KEEPALIVE_SECONDS env based option

TCP_KEEPALIVE_SECONDS value of 0 disables tcp keepalives. Change-Id: Iedcc06d5a8cb4b3958c23108b120ad3d15fee533 Partial-Bug: #1464016
Juniper · Jul 2, 2016 · fed8570 · fed8570
1 parent e18ced3
commit fed8570
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/bgp/test/bgp_stress_test.cc b/src/bgp/test/bgp_stress_test.cc
@@ -2295,11 +2295,6 @@ void BgpStressTest::AddAllRoutes(int ninstances, int npeers, int nagents,
                             "IFMAP configuration");
     }
 
-    // Wait for subscription processing to complete
-    TASK_UTIL_EXPECT_NE(0, server_->membership_mgr()->total_jobs_count());
-    TASK_UTIL_EXPECT_EQ(0, server_->membership_mgr()->current_jobs_count());
-    WaitForIdle();
-
     BGP_STRESS_TEST_LOG("Start injecting BGP and/or XMPP routes");
     AddAllBgpRoutes(nroutes, ntargets);
     BGP_STRESS_TEST_LOG("End injecting BGP and/or XMPP routes");

diff --git a/src/xmpp/xmpp_session.cc b/src/xmpp/xmpp_session.cc
@@ -99,6 +99,13 @@ void XmppSession::IncStats(unsigned int type, uint64_t bytes) {
 }
 
 boost::system::error_code XmppSession::EnableTcpKeepalive(int hold_time) {
+    char *keepalive_time_str = getenv("TCP_KEEPALIVE_SECONDS");
+    if (keepalive_time_str) {
+        hold_time = strtoul(keepalive_time_str, NULL, 0) * 3;
+        if (!hold_time)
+            return boost::system::error_code();
+    }
+
     if (hold_time <= 9) {
         hold_time = 9; // min hold-time in secs.
     }