Skip to content

HDDS-12795. Rename heartbeat and first election configuration name #8249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 4 commits into from
May 2, 2025
Merged

HDDS-12795. Rename heartbeat and first election configuration name #8249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eab1ab9
HDDS-12795. Improve Initial heartbeat and first election time configu…
xichen01 Apr 7, 2025
6f6c01b
Merge remote-tracking branch 'origin/master' into HDDS-12795
adoroszlai Apr 28, 2025
dd25c94
keep original constant names
adoroszlai Apr 28, 2025
7b6d8fe
apply suggestion from review
adoroszlai May 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Comment on lines 30 to +31
Copy link
Contributor

@szetszwo szetszwo May 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@adoroszlai , How about rename also the variables?

  • HDDS_INITIAL_HEARTBEAT_INTERVAL -> HDDS_HEARTBEAT_INITIAL_INTERVAL

and all the other variables.

Copy link
Contributor

@adoroszlai adoroszlai May 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about rename also the variables?

  • HDDS_INITIAL_HEARTBEAT_INTERVAL -> HDDS_HEARTBEAT_INITIAL_INTERVAL

and all the other variables.

I'd rather not, I think it inflates the patch unnecessarily. One of the benefits of the indirection (vs. using the value directly everywhere) is that it allows changing the value in a single place.

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 =
Expand Down
2 changes: 2 additions & 0 deletions hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
});
}

Expand Down
2 changes: 1 addition & 1 deletion hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
8 changes: 4 additions & 4 deletions hadoop-hdds/common/src/main/resources/ozone-default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -1154,23 +1154,23 @@
</description>
</property>
<property>
<name>hdds.initial.heartbeat.interval</name>
<name>hdds.heartbeat.initial-interval</name>
<value>2s</value>
<tag>OZONE, MANAGEMENT</tag>
<description>
Heartbeat interval used during Datanode initialization for SCM.
</description>
</property>
<property>
<name>hdds.recon.heartbeat.interval</name>
<name>hdds.heartbeat.recon.interval</name>
<value>60s</value>
<tag>OZONE, MANAGEMENT, RECON</tag>
<description>
The heartbeat interval from a Datanode to Recon.
</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>
Expand Down