This is an automated email from the ASF dual-hosted git repository.
sodonnell pushed a commit to branch HDDS-14496-zdu
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/HDDS-14496-zdu by this push:
new 90ad60d52bf HDDS-14712. Rename DatanodeVersion to HDDSVersion (#9822)
90ad60d52bf is described below
commit 90ad60d52bf8d721d4199b39d84865b7b07e12d1
Author: Ethan Rose <[email protected]>
AuthorDate: Thu Feb 26 11:58:09 2026 -0500
HDDS-14712. Rename DatanodeVersion to HDDSVersion (#9822)
---
.../hadoop/hdds/scm/storage/BlockOutputStream.java | 2 +-
.../ozone/client/io/BlockInputStreamFactoryImpl.java | 2 +-
.../hdds/{DatanodeVersion.java => HDDSVersion.java} | 16 ++++++++--------
.../org/apache/hadoop/hdds/protocol/DatanodeDetails.java | 6 +++---
.../hadoop/hdds/TestComponentVersionInvariants.java | 6 +++---
.../apache/hadoop/hdds/protocol/TestDatanodeDetails.java | 6 +++---
.../org/apache/hadoop/ozone/HddsDatanodeService.java | 6 +++---
.../transport/server/ratis/XceiverServerRatis.java | 6 +++---
.../java/org/apache/hadoop/ozone/debug/VersionDebug.java | 4 ++--
.../org/apache/hadoop/ozone/freon/DatanodeSimulator.java | 8 ++++----
.../ozone/client/rpc/TestBlockDataStreamOutput.java | 4 ++--
.../org/apache/hadoop/ozone/UniformDatanodesFactory.java | 14 +++++++-------
12 files changed, 40 insertions(+), 40 deletions(-)
diff --git
a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java
b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java
index d7076df3ba0..e6b76b77742 100644
---
a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java
+++
b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java
@@ -17,7 +17,7 @@
package org.apache.hadoop.hdds.scm.storage;
-import static
org.apache.hadoop.hdds.DatanodeVersion.COMBINED_PUTBLOCK_WRITECHUNK_RPC;
+import static
org.apache.hadoop.hdds.HDDSVersion.COMBINED_PUTBLOCK_WRITECHUNK_RPC;
import static
org.apache.hadoop.hdds.scm.storage.ContainerProtocolCalls.putBlockAsync;
import static
org.apache.hadoop.hdds.scm.storage.ContainerProtocolCalls.writeChunkAsync;
import static org.apache.hadoop.ozone.OzoneConsts.INCREMENTAL_CHUNK_LIST;
diff --git
a/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockInputStreamFactoryImpl.java
b/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockInputStreamFactoryImpl.java
index 02527129d5a..e6122541ef2 100644
---
a/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockInputStreamFactoryImpl.java
+++
b/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockInputStreamFactoryImpl.java
@@ -17,7 +17,7 @@
package org.apache.hadoop.ozone.client.io;
-import static org.apache.hadoop.hdds.DatanodeVersion.STREAM_BLOCK_SUPPORT;
+import static org.apache.hadoop.hdds.HDDSVersion.STREAM_BLOCK_SUPPORT;
import java.io.IOException;
import java.util.concurrent.ExecutorService;
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/DatanodeVersion.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HDDSVersion.java
similarity index 80%
rename from
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/DatanodeVersion.java
rename to
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HDDSVersion.java
index 2717e8eb3d9..c6cf9af4069 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/DatanodeVersion.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HDDSVersion.java
@@ -26,7 +26,7 @@
/**
* Versioning for datanode.
*/
-public enum DatanodeVersion implements ComponentVersion {
+public enum HDDSVersion implements ComponentVersion {
DEFAULT_VERSION(0, "Initial version"),
@@ -39,17 +39,17 @@ public enum DatanodeVersion implements ComponentVersion {
FUTURE_VERSION(-1, "Used internally in the client when the server side is "
+ " newer and an unknown server version has arrived to the client.");
- public static final DatanodeVersion CURRENT = latest();
+ public static final HDDSVersion CURRENT = latest();
public static final int CURRENT_VERSION = CURRENT.version;
- private static final Map<Integer, DatanodeVersion> BY_PROTO_VALUE =
+ private static final Map<Integer, HDDSVersion> BY_PROTO_VALUE =
Arrays.stream(values())
- .collect(toMap(DatanodeVersion::toProtoValue, identity()));
+ .collect(toMap(HDDSVersion::toProtoValue, identity()));
private final int version;
private final String description;
- DatanodeVersion(int version, String description) {
+ HDDSVersion(int version, String description) {
this.version = version;
this.description = description;
}
@@ -64,12 +64,12 @@ public int toProtoValue() {
return version;
}
- public static DatanodeVersion fromProtoValue(int value) {
+ public static HDDSVersion fromProtoValue(int value) {
return BY_PROTO_VALUE.getOrDefault(value, FUTURE_VERSION);
}
- private static DatanodeVersion latest() {
- DatanodeVersion[] versions = DatanodeVersion.values();
+ private static HDDSVersion latest() {
+ HDDSVersion[] versions = HDDSVersion.values();
return versions[versions.length - 2];
}
}
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/protocol/DatanodeDetails.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/protocol/DatanodeDetails.java
index 2585f593611..6a11dc1b74e 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/protocol/DatanodeDetails.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/protocol/DatanodeDetails.java
@@ -36,7 +36,7 @@
import java.util.Set;
import java.util.UUID;
import org.apache.commons.lang3.StringUtils;
-import org.apache.hadoop.hdds.DatanodeVersion;
+import org.apache.hadoop.hdds.HDDSVersion;
import org.apache.hadoop.hdds.HddsUtils;
import org.apache.hadoop.hdds.annotation.InterfaceAudience;
import org.apache.hadoop.hdds.annotation.InterfaceStability;
@@ -469,7 +469,7 @@ public static DatanodeDetails.Builder newBuilder(
builder.setCurrentVersion(datanodeDetailsProto.getCurrentVersion());
} else {
// fallback to version 1 if not present
-
builder.setCurrentVersion(DatanodeVersion.SEPARATE_RATIS_PORTS_AVAILABLE.toProtoValue());
+
builder.setCurrentVersion(HDDSVersion.SEPARATE_RATIS_PORTS_AVAILABLE.toProtoValue());
}
return builder;
}
@@ -727,7 +727,7 @@ public static final class Builder {
private HddsProtos.NodeOperationalState persistedOpState;
private long persistedOpStateExpiryEpochSec = 0;
private int initialVersion;
- private int currentVersion = DatanodeVersion.CURRENT_VERSION;
+ private int currentVersion = HDDSVersion.CURRENT_VERSION;
/**
* Default private constructor. To create Builder instance use
diff --git
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestComponentVersionInvariants.java
b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestComponentVersionInvariants.java
index e05c01a68a2..10129a781e8 100644
---
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestComponentVersionInvariants.java
+++
b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestComponentVersionInvariants.java
@@ -36,9 +36,9 @@ public class TestComponentVersionInvariants {
public static Stream<Arguments> values() {
return Stream.of(
arguments(
- DatanodeVersion.values(),
- DatanodeVersion.DEFAULT_VERSION,
- DatanodeVersion.FUTURE_VERSION),
+ HDDSVersion.values(),
+ HDDSVersion.DEFAULT_VERSION,
+ HDDSVersion.FUTURE_VERSION),
arguments(
ClientVersion.values(),
ClientVersion.DEFAULT_VERSION,
diff --git
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/protocol/TestDatanodeDetails.java
b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/protocol/TestDatanodeDetails.java
index dcbf9553dd0..86ed63c7f1d 100644
---
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/protocol/TestDatanodeDetails.java
+++
b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/protocol/TestDatanodeDetails.java
@@ -28,7 +28,7 @@
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.hadoop.hdds.DatanodeVersion;
+import org.apache.hadoop.hdds.HDDSVersion;
import org.apache.hadoop.hdds.protocol.DatanodeDetails.Port;
import org.apache.hadoop.hdds.protocol.DatanodeDetails.Port.Name;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
@@ -77,13 +77,13 @@ public void testNewBuilderCurrentVersion() {
dn.toProtoBuilder(DEFAULT_VERSION.toProtoValue(), requiredPorts);
protoBuilder.clearCurrentVersion();
DatanodeDetails dn2 =
DatanodeDetails.newBuilder(protoBuilder.build()).build();
-
assertEquals(DatanodeVersion.SEPARATE_RATIS_PORTS_AVAILABLE.toProtoValue(),
dn2.getCurrentVersion());
+ assertEquals(HDDSVersion.SEPARATE_RATIS_PORTS_AVAILABLE.toProtoValue(),
dn2.getCurrentVersion());
// test that if the current version is set, it is used
protoBuilder =
dn.toProtoBuilder(DEFAULT_VERSION.toProtoValue(), requiredPorts);
DatanodeDetails dn3 =
DatanodeDetails.newBuilder(protoBuilder.build()).build();
- assertEquals(DatanodeVersion.CURRENT.toProtoValue(),
dn3.getCurrentVersion());
+ assertEquals(HDDSVersion.CURRENT.toProtoValue(), dn3.getCurrentVersion());
}
public static void assertPorts(HddsProtos.DatanodeDetailsProto dn,
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java
index b0fbfe30b93..aca713d1104 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java
@@ -56,7 +56,7 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.hadoop.conf.Configurable;
-import org.apache.hadoop.hdds.DatanodeVersion;
+import org.apache.hadoop.hdds.HDDSVersion;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.HddsUtils;
import org.apache.hadoop.hdds.cli.GenericCli;
@@ -816,13 +816,13 @@ private String reconfigScmNodes(String value) {
* Returns the initial version of the datanode.
*/
private int getInitialVersion() {
- return conf.getInt(TESTING_DATANODE_VERSION_INITIAL,
DatanodeVersion.CURRENT_VERSION);
+ return conf.getInt(TESTING_DATANODE_VERSION_INITIAL,
HDDSVersion.CURRENT_VERSION);
}
/**
* Returns the current version of the datanode.
*/
private int getCurrentVersion() {
- return conf.getInt(TESTING_DATANODE_VERSION_CURRENT,
DatanodeVersion.CURRENT_VERSION);
+ return conf.getInt(TESTING_DATANODE_VERSION_CURRENT,
HDDSVersion.CURRENT_VERSION);
}
}
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java
index 6eadec2d6d3..b41d086f742 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java
@@ -17,7 +17,7 @@
package org.apache.hadoop.ozone.container.common.transport.server.ratis;
-import static
org.apache.hadoop.hdds.DatanodeVersion.SEPARATE_RATIS_PORTS_AVAILABLE;
+import static
org.apache.hadoop.hdds.HDDSVersion.SEPARATE_RATIS_PORTS_AVAILABLE;
import static
org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_CONTAINER_RATIS_LOG_APPENDER_QUEUE_BYTE_LIMIT;
import static
org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_CONTAINER_RATIS_LOG_APPENDER_QUEUE_BYTE_LIMIT_DEFAULT;
import static
org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_CONTAINER_RATIS_LOG_APPENDER_QUEUE_NUM_ELEMENTS;
@@ -52,7 +52,7 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.hadoop.hdds.DatanodeVersion;
+import org.apache.hadoop.hdds.HDDSVersion;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.HddsUtils;
import org.apache.hadoop.hdds.conf.ConfigurationSource;
@@ -216,7 +216,7 @@ private void assignPorts() {
OzoneConfigKeys.HDDS_CONTAINER_RATIS_IPC_PORT,
OzoneConfigKeys.HDDS_CONTAINER_RATIS_IPC_PORT_DEFAULT);
- if (DatanodeVersion.fromProtoValue(datanodeDetails.getInitialVersion())
+ if (HDDSVersion.fromProtoValue(datanodeDetails.getInitialVersion())
.compareTo(SEPARATE_RATIS_PORTS_AVAILABLE) >= 0) {
adminPort = determinePort(
OzoneConfigKeys.HDDS_CONTAINER_RATIS_ADMIN_PORT,
diff --git
a/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/VersionDebug.java
b/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/VersionDebug.java
index 2112a7fac06..79a7e5c7bf0 100644
---
a/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/VersionDebug.java
+++
b/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/VersionDebug.java
@@ -22,7 +22,7 @@
import java.util.Map;
import java.util.concurrent.Callable;
import org.apache.hadoop.hdds.ComponentVersion;
-import org.apache.hadoop.hdds.DatanodeVersion;
+import org.apache.hadoop.hdds.HDDSVersion;
import org.apache.hadoop.hdds.cli.DebugSubcommand;
import org.apache.hadoop.hdds.server.JsonUtils;
import org.apache.hadoop.ozone.ClientVersion;
@@ -52,7 +52,7 @@ public Void call() throws IOException {
),
"components", ImmutableSortedMap.of(
"client", asMap(ClientVersion.CURRENT),
- "datanode", asMap(DatanodeVersion.CURRENT),
+ "datanode", asMap(HDDSVersion.CURRENT),
"om", asMap(OzoneManagerVersion.CURRENT)
)
)));
diff --git
a/hadoop-ozone/freon/src/main/java/org/apache/hadoop/ozone/freon/DatanodeSimulator.java
b/hadoop-ozone/freon/src/main/java/org/apache/hadoop/ozone/freon/DatanodeSimulator.java
index cb3769e7fd2..fb4023932ee 100644
---
a/hadoop-ozone/freon/src/main/java/org/apache/hadoop/ozone/freon/DatanodeSimulator.java
+++
b/hadoop-ozone/freon/src/main/java/org/apache/hadoop/ozone/freon/DatanodeSimulator.java
@@ -49,7 +49,7 @@
import java.util.concurrent.atomic.AtomicReference;
import org.apache.commons.lang3.RandomUtils;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hdds.DatanodeVersion;
+import org.apache.hadoop.hdds.HDDSVersion;
import org.apache.hadoop.hdds.HddsUtils;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.hdds.conf.ConfigurationSource;
@@ -460,8 +460,8 @@ private DatanodeDetails
randomDatanodeDetails(ConfigurationSource config)
DatanodeDetails details = DatanodeDetails.newBuilder()
.setUuid(UUID.randomUUID())
.build();
- details.setInitialVersion(DatanodeVersion.CURRENT_VERSION);
- details.setCurrentVersion(DatanodeVersion.CURRENT_VERSION);
+ details.setInitialVersion(HDDSVersion.CURRENT_VERSION);
+ details.setCurrentVersion(HDDSVersion.CURRENT_VERSION);
details.setHostName(HddsUtils.getHostName(config));
details.setIpAddress(randomIp());
details.setStandalonePort(0);
@@ -470,7 +470,7 @@ private DatanodeDetails
randomDatanodeDetails(ConfigurationSource config)
details.setVersion(HDDS_VERSION_INFO.getVersion());
details.setSetupTime(Time.now());
details.setRevision(HDDS_VERSION_INFO.getRevision());
- details.setCurrentVersion(DatanodeVersion.CURRENT_VERSION);
+ details.setCurrentVersion(HDDSVersion.CURRENT_VERSION);
return details;
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockDataStreamOutput.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockDataStreamOutput.java
index 3cea0590d85..ab71288a8dc 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockDataStreamOutput.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockDataStreamOutput.java
@@ -34,7 +34,7 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.stream.Stream;
-import org.apache.hadoop.hdds.DatanodeVersion;
+import org.apache.hadoop.hdds.HDDSVersion;
import org.apache.hadoop.hdds.client.ReplicationType;
import org.apache.hadoop.hdds.conf.ConfigurationSource;
import org.apache.hadoop.hdds.conf.DatanodeRatisServerConfig;
@@ -83,7 +83,7 @@ public class TestBlockDataStreamOutput {
private static final String VOLUME_NAME = "testblockoutputstream";
private static final String BUCKET_NAME = VOLUME_NAME;
private static String keyString = UUID.randomUUID().toString();
- private static final DatanodeVersion DN_OLD_VERSION =
DatanodeVersion.SEPARATE_RATIS_PORTS_AVAILABLE;
+ private static final HDDSVersion DN_OLD_VERSION =
HDDSVersion.SEPARATE_RATIS_PORTS_AVAILABLE;
static MiniOzoneCluster createCluster() throws IOException,
InterruptedException, TimeoutException {
diff --git
a/hadoop-ozone/mini-cluster/src/main/java/org/apache/hadoop/ozone/UniformDatanodesFactory.java
b/hadoop-ozone/mini-cluster/src/main/java/org/apache/hadoop/ozone/UniformDatanodesFactory.java
index 7e0a1003115..34fa80bc446 100644
---
a/hadoop-ozone/mini-cluster/src/main/java/org/apache/hadoop/ozone/UniformDatanodesFactory.java
+++
b/hadoop-ozone/mini-cluster/src/main/java/org/apache/hadoop/ozone/UniformDatanodesFactory.java
@@ -45,7 +45,7 @@
import java.util.Objects;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.hadoop.hdds.DatanodeVersion;
+import org.apache.hadoop.hdds.HDDSVersion;
import org.apache.hadoop.hdds.conf.ConfigurationTarget;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.container.common.DatanodeLayoutStorage;
@@ -61,8 +61,8 @@ public class UniformDatanodesFactory implements
MiniOzoneCluster.DatanodeFactory
private final int numDataVolumes;
private final String reservedSpace;
private final Integer layoutVersion;
- private final DatanodeVersion initialVersion;
- private final DatanodeVersion currentVersion;
+ private final HDDSVersion initialVersion;
+ private final HDDSVersion currentVersion;
protected UniformDatanodesFactory(Builder builder) {
numDataVolumes = builder.numDataVolumes;
@@ -145,8 +145,8 @@ public static class Builder {
private int numDataVolumes = 1;
private String reservedSpace;
private Integer layoutVersion;
- private DatanodeVersion initialVersion;
- private DatanodeVersion currentVersion;
+ private HDDSVersion initialVersion;
+ private HDDSVersion currentVersion;
/**
* Sets the number of data volumes per datanode.
@@ -174,12 +174,12 @@ public Builder setLayoutVersion(int layoutVersion) {
return this;
}
- public Builder setInitialVersion(DatanodeVersion version) {
+ public Builder setInitialVersion(HDDSVersion version) {
this.initialVersion = version;
return this;
}
- public Builder setCurrentVersion(DatanodeVersion version) {
+ public Builder setCurrentVersion(HDDSVersion version) {
this.currentVersion = version;
return this;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
