Merge "Change stale cleanup timer value to 5 minutes"

Juniper · Jun 23, 2016 · ea31f29 · ea31f29
2 parents b2a3b29 + 8c12350
commit ea31f29
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/src/control-node/contrail-control.conf b/src/control-node/contrail-control.conf
@@ -39,7 +39,7 @@ sandesh_send_rate_limit=100
 # password=control-node
 # server_url= # Provided by discovery server, e.g. https://127.0.0.1:8443
 # user=control-node
-# stale_entries_cleanup_timeout=10 # in seconds
+# stale_entries_cleanup_timeout=300 # in seconds
 # end_of_rib_timeout=10 # in seconds
 # peer_response_wait_time=60 # in seconds
 
diff --git a/src/control-node/options.cc b/src/control-node/options.cc
@@ -166,7 +166,7 @@ void Options::Initialize(EventManager &evm,
         ("IFMAP.user", opt::value<string>()->default_value("control-node"),
              "IFMAP server username")
         ("IFMAP.stale_entries_cleanup_timeout",
-             opt::value<int>()->default_value(10),
+             opt::value<int>()->default_value(300),
              "IFMAP stale entries cleanup timeout")
         ("IFMAP.end_of_rib_timeout", opt::value<int>()->default_value(10),
              "IFMAP end of rib timeout")

diff --git a/src/control-node/test/options_test.cc b/src/control-node/test/options_test.cc
@@ -75,7 +75,7 @@ TEST_F(OptionsTest, NoArguments) {
     EXPECT_EQ(options_.ifmap_password(), "control-node");
     EXPECT_EQ(options_.ifmap_user(), "control-node");
     EXPECT_EQ(options_.ifmap_certs_store(), "");
-    EXPECT_EQ(options_.ifmap_stale_entries_cleanup_timeout(), 10);
+    EXPECT_EQ(options_.ifmap_stale_entries_cleanup_timeout(), 300);
     EXPECT_EQ(options_.ifmap_end_of_rib_timeout(), 10);
     EXPECT_EQ(options_.ifmap_peer_response_wait_time(), 60);
     EXPECT_EQ(options_.xmpp_port(), default_xmpp_port);
@@ -117,7 +117,7 @@ TEST_F(OptionsTest, DefaultConfFile) {
     EXPECT_EQ(options_.ifmap_password(), "control-node");
     EXPECT_EQ(options_.ifmap_user(), "control-node");
     EXPECT_EQ(options_.ifmap_certs_store(), "");
-    EXPECT_EQ(options_.ifmap_stale_entries_cleanup_timeout(), 10);
+    EXPECT_EQ(options_.ifmap_stale_entries_cleanup_timeout(), 300);
     EXPECT_EQ(options_.ifmap_end_of_rib_timeout(), 10);
     EXPECT_EQ(options_.ifmap_peer_response_wait_time(), 60);
     EXPECT_EQ(options_.xmpp_port(), default_xmpp_port);

diff --git a/src/dns/cmn/dns_options.cc b/src/dns/cmn/dns_options.cc
@@ -154,7 +154,7 @@ void Options::Initialize(EventManager &evm,
         ("IFMAP.user", opt::value<string>()->default_value("dns_user"),
              "IFMAP server username")
         ("IFMAP.stale_entries_cleanup_timeout",
-             opt::value<int>()->default_value(10),
+             opt::value<int>()->default_value(300),
              "IFMAP stale entries cleanup timeout")
         ("IFMAP.end_of_rib_timeout", opt::value<int>()->default_value(10),
              "IFMAP end of rib timeout")

diff --git a/src/dns/contrail-dns.conf b/src/dns/contrail-dns.conf
@@ -44,7 +44,7 @@ sandesh_send_rate_limit=100
 # password=dns-user-passwd
 # server_url= # Provided by discovery server, e.g. https://127.0.0.1:8443
 # user=dns-user
-# stale_entries_cleanup_timeout=10 # in seconds
+# stale_entries_cleanup_timeout=300 # in seconds
 # end_of_rib_timeout=10 # in seconds
 # peer_response_wait_time=60 # in seconds
 
diff --git a/src/dns/test/dns_options_test.cc b/src/dns/test/dns_options_test.cc
@@ -75,7 +75,7 @@ TEST_F(OptionsTest, NoArguments) {
     EXPECT_EQ(options_.ifmap_password(), "dns_user_passwd");
     EXPECT_EQ(options_.ifmap_user(), "dns_user");
     EXPECT_EQ(options_.ifmap_certs_store(), "");
-    EXPECT_EQ(options_.ifmap_stale_entries_cleanup_timeout(), 10);
+    EXPECT_EQ(options_.ifmap_stale_entries_cleanup_timeout(), 300);
     EXPECT_EQ(options_.ifmap_end_of_rib_timeout(), 10);
     EXPECT_EQ(options_.ifmap_peer_response_wait_time(), 60);
     EXPECT_EQ(options_.test_mode(), false);
@@ -121,7 +121,7 @@ TEST_F(OptionsTest, DefaultConfFile) {
     EXPECT_EQ(options_.ifmap_password(), "dns_user_passwd");
     EXPECT_EQ(options_.ifmap_user(), "dns_user");
     EXPECT_EQ(options_.ifmap_certs_store(), "");
-    EXPECT_EQ(options_.ifmap_stale_entries_cleanup_timeout(), 10);
+    EXPECT_EQ(options_.ifmap_stale_entries_cleanup_timeout(), 300);
     EXPECT_EQ(options_.ifmap_end_of_rib_timeout(), 10);
     EXPECT_EQ(options_.ifmap_peer_response_wait_time(), 60);
     EXPECT_EQ(options_.test_mode(), false);