You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by sa...@apache.org on 2020/12/30 07:17:08 UTC
[ozone] branch HDDS-2823 updated: HDDS-4628: min/max election
timeout of SCMRatisServer is not set properly. (#1742)
This is an automated email from the ASF dual-hosted git repository.
sammichen pushed a commit to branch HDDS-2823
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/HDDS-2823 by this push:
new adbc89b HDDS-4628: min/max election timeout of SCMRatisServer is not set properly. (#1742)
adbc89b is described below
commit adbc89b17cd31f2cdb0f9fdb617db4fa869691c7
Author: GlenGeng <gl...@tencent.com>
AuthorDate: Wed Dec 30 15:16:44 2020 +0800
HDDS-4628: min/max election timeout of SCMRatisServer is not set properly. (#1742)
---
.../main/java/org/apache/hadoop/hdds/scm/ha/RatisUtil.java | 4 ++--
.../org/apache/hadoop/hdds/scm/ha/SCMHAConfiguration.java | 12 ++++--------
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/RatisUtil.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/RatisUtil.java
index 1bc1697..253d996 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/RatisUtil.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/RatisUtil.java
@@ -100,9 +100,9 @@ public final class RatisUtil {
Rpc.setRequestTimeout(properties, TimeDuration.valueOf(
conf.getRatisRequestTimeout(), TimeUnit.MILLISECONDS));
Rpc.setTimeoutMin(properties, TimeDuration.valueOf(
- conf.getRatisRequestMinTimeout(), TimeUnit.MILLISECONDS));
+ conf.getLeaderElectionMinTimeout(), TimeUnit.MILLISECONDS));
Rpc.setTimeoutMax(properties, TimeDuration.valueOf(
- conf.getRatisRequestMaxTimeout(), TimeUnit.MILLISECONDS));
+ conf.getLeaderElectionMaxTimeout(), TimeUnit.MILLISECONDS));
Rpc.setSlownessTimeout(properties, TimeDuration.valueOf(
conf.getRatisNodeFailureTimeout(), TimeUnit.MILLISECONDS));
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAConfiguration.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAConfiguration.java
index 5fbf268..78e2cb2 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAConfiguration.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAConfiguration.java
@@ -203,16 +203,12 @@ public class SCMHAConfiguration {
return ratisRequestTimeout;
}
- public long getRatisRequestMinTimeout() {
- return ratisRequestTimeout - 1000L;
- }
-
- public long getRatisRequestMaxTimeout() {
- return ratisRequestTimeout + 1000L;
+ public long getLeaderElectionMinTimeout() {
+ return ratisLeaderElectionTimeout;
}
- public long getRatisLeaderElectionTimeout() {
- return ratisLeaderElectionTimeout;
+ public long getLeaderElectionMaxTimeout() {
+ return ratisLeaderElectionTimeout + 200L;
}
public long getRatisNodeFailureTimeout() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org