This is an automated email from the ASF dual-hosted git repository.
sammichen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 6f6a0571fc HDDS-7964. Enable ratis pre-vote in Ozone by default.
(#4272)
6f6a0571fc is described below
commit 6f6a0571fc1f5425ff90975158278ec252c040a4
Author: Sammi Chen <[email protected]>
AuthorDate: Thu Feb 16 12:07:54 2023 +0800
HDDS-7964. Enable ratis pre-vote in Ozone by default. (#4272)
---
.../src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java | 2 +-
hadoop-hdds/common/src/main/resources/ozone-default.xml | 4 ++--
.../java/org/apache/hadoop/hdds/conf/DatanodeRatisServerConfig.java | 4 ++--
.../common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
index 859c594b93..2c80c74f29 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
@@ -577,7 +577,7 @@ public final class ScmConfigKeys {
public static final String OZONE_SCM_HA_RATIS_SERVER_ELECTION_PRE_VOTE =
"ozone.scm.ha.ratis.server.leaderelection.pre-vote";
public static final boolean
- OZONE_SCM_HA_RATIS_SERVER_ELECTION_PRE_VOTE_DEFAULT = false;
+ OZONE_SCM_HA_RATIS_SERVER_ELECTION_PRE_VOTE_DEFAULT = true;
public static final String OZONE_AUDIT_LOG_DEBUG_CMD_LIST_SCMAUDIT =
"ozone.audit.log.debug.cmd.list.scmaudit";
diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml
b/hadoop-hdds/common/src/main/resources/ozone-default.xml
index e5d4f56cb8..d5f00e397a 100644
--- a/hadoop-hdds/common/src/main/resources/ozone-default.xml
+++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@ -1921,7 +1921,7 @@
<property>
<name>ozone.om.ratis.server.leaderelection.pre-vote </name>
- <value>false</value>
+ <value>true</value>
<tag>OZONE, OM, RATIS, MANAGEMENT</tag>
<description>Enable/disable OM HA leader election pre-vote phase.
</description>
@@ -3276,7 +3276,7 @@
</property>
<property>
<name>ozone.scm.ha.ratis.server.leaderelection.pre-vote</name>
- <value>false</value>
+ <value>true</value>
<tag>SCM, OZONE, HA, RATIS</tag>
<description>Enable/disable SCM HA leader election pre-vote
phase.</description>
</property>
diff --git
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisServerConfig.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisServerConfig.java
index 058932e769..11373e3301 100644
---
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisServerConfig.java
+++
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisServerConfig.java
@@ -176,12 +176,12 @@ public class DatanodeRatisServerConfig {
}
@Config(key = "leaderelection.pre-vote",
- defaultValue = "false",
+ defaultValue = "true",
type = ConfigType.BOOLEAN,
tags = {OZONE, DATANODE, RATIS},
description = "Flag to enable/disable ratis election pre-vote."
)
- private boolean preVoteEnabled;
+ private boolean preVoteEnabled = true;
public boolean isPreVoteEnabled() {
return preVoteEnabled;
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java
index ed0167ee32..9ba5485da2 100644
---
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java
+++
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java
@@ -183,7 +183,7 @@ public final class OMConfigKeys {
public static final String OZONE_OM_RATIS_SERVER_ELECTION_PRE_VOTE =
"ozone.om.ratis.server.leaderelection.pre-vote";
public static final boolean
- OZONE_OM_RATIS_SERVER_ELECTION_PRE_VOTE_DEFAULT = false;
+ OZONE_OM_RATIS_SERVER_ELECTION_PRE_VOTE_DEFAULT = true;
// OM SnapshotProvider configurations
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
