From 00924b9605442670996aaee6df4bd4c5c4f36c94 Mon Sep 17 00:00:00 2001 From: Tapan Karwa Date: Wed, 22 Jun 2016 16:20:42 -0700 Subject: [PATCH] Change stale cleanup timer value to 5 minutes Change-Id: I2872c79a361194a0d07f91535c1df3cceb4b0e3f Closes-Bug: #1595343 (cherry picked from commit 8c12350784becef91e3c5db839540db567cec6d1) --- src/control-node/contrail-control.conf | 2 +- src/control-node/options.cc | 2 +- src/control-node/test/options_test.cc | 4 ++-- src/dns/cmn/dns_options.cc | 2 +- src/dns/contrail-dns.conf | 2 +- src/dns/test/dns_options_test.cc | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/control-node/contrail-control.conf b/src/control-node/contrail-control.conf index 0529cb9ffcf..076edc216b2 100644 --- a/src/control-node/contrail-control.conf +++ b/src/control-node/contrail-control.conf @@ -33,7 +33,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 index c6305b21ed5..61cdf1a094e 100644 --- a/src/control-node/options.cc +++ b/src/control-node/options.cc @@ -151,7 +151,7 @@ void Options::Initialize(EventManager &evm, ("IFMAP.user", opt::value()->default_value("control-node"), "IFMAP server username") ("IFMAP.stale_entries_cleanup_timeout", - opt::value()->default_value(10), + opt::value()->default_value(300), "IFMAP stale entries cleanup timeout") ("IFMAP.end_of_rib_timeout", opt::value()->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 index 8ae34f68c65..09dd9d299f2 100644 --- 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); @@ -115,7 +115,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 index 3b190ccf54e..817387e6a8c 100644 --- a/src/dns/cmn/dns_options.cc +++ b/src/dns/cmn/dns_options.cc @@ -148,7 +148,7 @@ void Options::Initialize(EventManager &evm, ("IFMAP.user", opt::value()->default_value("dns_user"), "IFMAP server username") ("IFMAP.stale_entries_cleanup_timeout", - opt::value()->default_value(10), + opt::value()->default_value(300), "IFMAP stale entries cleanup timeout") ("IFMAP.end_of_rib_timeout", opt::value()->default_value(10), "IFMAP end of rib timeout") diff --git a/src/dns/contrail-dns.conf b/src/dns/contrail-dns.conf index 26badab6a69..d80dd5747d7 100644 --- a/src/dns/contrail-dns.conf +++ b/src/dns/contrail-dns.conf @@ -38,7 +38,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 index 9efc8f22d5c..5d37e6cb59a 100644 --- 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);