This is an automated email from the ASF dual-hosted git repository.
adoroszlai 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 8b095d5d24 HDDS-12795. Rename heartbeat and first election
configuration name (#8249)
8b095d5d24 is described below
commit 8b095d5d24c04bfac2fc7e0f7d160c496900f8c6
Author: XiChen <[email protected]>
AuthorDate: Fri May 2 20:58:46 2025 +0800
HDDS-12795. Rename heartbeat and first election configuration name (#8249)
Co-authored-by: Doroszlai, Attila <[email protected]>
---
.../src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java | 6 +++---
.../main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java | 2 ++
.../src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java | 2 +-
hadoop-hdds/common/src/main/resources/ozone-default.xml | 8 ++++----
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
index c9d94f0b91..22c6cfb7fa 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
@@ -28,15 +28,15 @@ public final class HddsConfigKeys {
public static final String HDDS_HEARTBEAT_INTERVAL_DEFAULT =
"30s";
public static final String HDDS_INITIAL_HEARTBEAT_INTERVAL =
- "hdds.initial.heartbeat.interval";
+ "hdds.heartbeat.initial-interval";
public static final String HDDS_INITIAL_HEARTBEAT_INTERVAL_DEFAULT =
"2s";
public static final String HDDS_RECON_HEARTBEAT_INTERVAL =
- "hdds.recon.heartbeat.interval";
+ "hdds.heartbeat.recon.interval";
public static final String HDDS_RECON_HEARTBEAT_INTERVAL_DEFAULT =
"60s";
public static final String HDDS_RECON_INITIAL_HEARTBEAT_INTERVAL =
- "hdds.recon.initial.heartbeat.interval";
+ "hdds.heartbeat.recon.initial-interval";
public static final String HDDS_RECON_INITIAL_HEARTBEAT_INTERVAL_DEFAULT =
"2s";
public static final String HDDS_NODE_REPORT_INTERVAL =
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java
index e2099caf51..6959641c84 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java
@@ -409,6 +409,8 @@ private static void addDeprecatedKeys() {
HddsConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY),
new DeprecationDelta("dfs.metrics.percentiles.intervals",
HddsConfigKeys.HDDS_METRICS_PERCENTILES_INTERVALS_KEY),
+ new DeprecationDelta("hdds.recon.heartbeat.interval",
+ HddsConfigKeys.HDDS_RECON_HEARTBEAT_INTERVAL),
});
}
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
index e1a1df0a96..dbb9136688 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
@@ -406,7 +406,7 @@ public final class OzoneConfigKeys {
public static final long HDDS_RATIS_SNAPSHOT_THRESHOLD_DEFAULT =
ScmConfigKeys.HDDS_RATIS_SNAPSHOT_THRESHOLD_DEFAULT;
public static final String
HDDS_RATIS_LEADER_FIRST_ELECTION_MINIMUM_TIMEOUT_DURATION_KEY =
- "hdds.ratis.leader.first.election.minimum.timeout.duration";
+ "hdds.raft.server.rpc.first-election.timeout";
public static final String HDDS_DATANODE_PLUGINS_KEY =
"hdds.datanode.plugins";
diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml
b/hadoop-hdds/common/src/main/resources/ozone-default.xml
index 13d18e4acc..b250771f81 100644
--- a/hadoop-hdds/common/src/main/resources/ozone-default.xml
+++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@ -339,7 +339,7 @@
</description>
</property>
<property>
- <name>hdds.ratis.leader.first.election.minimum.timeout.duration</name>
+ <name>hdds.raft.server.rpc.first-election.timeout</name>
<value/>
<tag>OZONE, RATIS, MANAGEMENT</tag>
<description>ratis Minimum timeout for the first election of a leader.
@@ -1154,7 +1154,7 @@
</description>
</property>
<property>
- <name>hdds.initial.heartbeat.interval</name>
+ <name>hdds.heartbeat.initial-interval</name>
<value>2s</value>
<tag>OZONE, MANAGEMENT</tag>
<description>
@@ -1162,7 +1162,7 @@
</description>
</property>
<property>
- <name>hdds.recon.heartbeat.interval</name>
+ <name>hdds.heartbeat.recon.interval</name>
<value>60s</value>
<tag>OZONE, MANAGEMENT, RECON</tag>
<description>
@@ -1170,7 +1170,7 @@
</description>
</property>
<property>
- <name>hdds.recon.initial.heartbeat.interval</name>
+ <name>hdds.heartbeat.recon.initial-interval</name>
<value>60s</value>
<tag>OZONE, MANAGEMENT, RECON</tag>
<description>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
