From e62f02c63c01309e2d20de62d656ed42fec1c214 Mon Sep 17 00:00:00 2001
From: HeYuchen <377710264@qq.com>
Date: Mon, 7 Jan 2019 18:13:32 +0800
Subject: [PATCH] fd: fix failure detection bug (#247)

---
 rdsn                              | 2 +-
 scripts/pegasus_rolling_update.sh | 2 +-
 src/server/config-server.ini      | 6 +++---
 src/server/config.ini             | 4 ++--
 src/server/test/config.ini        | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/rdsn b/rdsn
index 40eda9f..0588800 160000
--- a/rdsn
+++ b/rdsn
@@ -1 +1 @@
-Subproject commit 40eda9fc2b8d93eb23a7ef9c311d5f32e0d000d1
+Subproject commit 0588800ba8f441444149dca312ec1ab40eee0efb
diff --git a/scripts/pegasus_rolling_update.sh b/scripts/pegasus_rolling_update.sh
index 07d50ab..bc2795f 100755
--- a/scripts/pegasus_rolling_update.sh
+++ b/scripts/pegasus_rolling_update.sh
@@ -281,7 +281,7 @@ if [ "$type" = "all" ]; then
   echo "=================================================================="
   echo "Rolling update meta servers and collectors..."
   cd $minos_client_dir
-  ./deploy rolling_update pegasus $cluster --skip_confirm --time_interval 10 $update_options --job meta collector
+  ./deploy rolling_update pegasus $cluster --skip_confirm --time_interval 20 $update_options --job meta collector
   cd $shell_dir
   echo
 
diff --git a/src/server/config-server.ini b/src/server/config-server.ini
index f737cbf..26e2cd5 100644
--- a/src/server/config-server.ini
+++ b/src/server/config-server.ini
@@ -222,10 +222,10 @@ disk_stat_disabled = false
 disk_stat_interval_seconds = 600
 
 fd_disabled = false
-fd_check_interval_seconds = 5
+fd_check_interval_seconds = 2
 fd_beacon_interval_seconds = 3
-fd_lease_seconds = 10
-fd_grace_seconds = 15
+fd_lease_seconds = 20
+fd_grace_seconds = 22
 
 log_private_file_size_mb = 32
 log_private_batch_buffer_kb = 512
diff --git a/src/server/config.ini b/src/server/config.ini
index bf7fd53..b938f63 100644
--- a/src/server/config.ini
+++ b/src/server/config.ini
@@ -212,8 +212,8 @@
   fd_disabled = false
   fd_check_interval_seconds = 2
   fd_beacon_interval_seconds = 3
-  fd_lease_seconds = 9
-  fd_grace_seconds = 10
+  fd_lease_seconds = 20
+  fd_grace_seconds = 22
 
   log_private_file_size_mb = 32
   log_private_batch_buffer_kb = 7
diff --git a/src/server/test/config.ini b/src/server/test/config.ini
index ed42228..b161ffa 100644
--- a/src/server/test/config.ini
+++ b/src/server/test/config.ini
@@ -172,8 +172,8 @@ gc_disk_error_replica_interval_seconds = 172800000
 fd_disabled = false
 fd_check_interval_seconds = 5
 fd_beacon_interval_seconds = 3
-fd_lease_seconds = 10
-fd_grace_seconds = 15
+fd_lease_seconds = 20
+fd_grace_seconds = 22
 
 log_private_file_size_mb = 32
 log_private_batch_buffer_kb = 512
-- 
GitLab