This is an automated email from the ASF dual-hosted git repository.
errose28 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 0bd403261f9 HDDS-15483. More renames missed in HDDS-15375 (#10436)
0bd403261f9 is described below
commit 0bd403261f9b46427e71018e5c6f389588a4941f
Author: Ethan Rose <[email protected]>
AuthorDate: Mon Jun 8 11:54:52 2026 -0400
HDDS-15483. More renames missed in HDDS-15375 (#10436)
---
.../java/org/apache/hadoop/hdds/HDDSVersion.java | 2 +-
.../apache/hadoop/ozone/OzoneManagerVersion.java | 2 +-
.../hadoop/hdds/AbstractComponentVersionTest.java | 48 +++++++++++-----------
.../org/apache/hadoop/hdds/TestClientVersion.java | 2 +-
.../org/apache/hadoop/hdds/TestHDDSVersion.java | 2 +-
.../hadoop/hdds/TestOzoneManagerVersion.java | 2 +-
.../hadoop/hdds/upgrade/TestHDDSLayoutFeature.java | 4 +-
.../apache/hadoop/ozone/client/rpc/RpcClient.java | 3 +-
.../hadoop/ozone/client/rpc/TestRpcClient.java | 2 +-
.../ozone/om/upgrade/TestOMLayoutFeature.java | 2 +-
10 files changed, 33 insertions(+), 36 deletions(-)
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HDDSVersion.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HDDSVersion.java
index 345f76a7aa6..2cd2720d720 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HDDSVersion.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HDDSVersion.java
@@ -66,7 +66,7 @@ public String description() {
}
/**
- * @return The next version immediately following this one and excluding
FUTURE_VERSION,
+ * @return The next version immediately following this one and excluding
{@link #UNKNOWN_VERSION},
* or null if there is no such version.
*/
@Override
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneManagerVersion.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneManagerVersion.java
index 55ec6b77f7a..c836d2ffd4b 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneManagerVersion.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneManagerVersion.java
@@ -102,7 +102,7 @@ public static OzoneManagerVersion deserialize(int value) {
/**
- * @return The next version immediately following this one and excluding
FUTURE_VERSION,
+ * @return The next version immediately following this one and excluding
{@link #UNKNOWN_VERSION},
* or null if there is no such version.
*/
@Override
diff --git
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/AbstractComponentVersionTest.java
b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/AbstractComponentVersionTest.java
index c9b2a32647f..49f54776efb 100644
---
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/AbstractComponentVersionTest.java
+++
b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/AbstractComponentVersionTest.java
@@ -35,33 +35,30 @@ public abstract class AbstractComponentVersionTest {
protected abstract ComponentVersion getDefaultVersion();
- protected abstract ComponentVersion getFutureVersion();
+ protected abstract ComponentVersion getUnknownVersion();
protected abstract ComponentVersion deserialize(int value);
- // FUTURE_VERSION is the latest
@Test
- public void testFutureVersionHasTheHighestOrdinal() {
+ public void testUnknownFutureVersionHasTheHighestOrdinal() {
ComponentVersion[] values = getValues();
- ComponentVersion futureValue = getFutureVersion();
- assertEquals(values[values.length - 1], futureValue);
+ ComponentVersion unknownVersion = getUnknownVersion();
+ assertEquals(values[values.length - 1], unknownVersion);
}
- // FUTURE_VERSION's internal version id is -1
@Test
- public void testFutureVersionSerializesToMinusOne() {
- ComponentVersion futureValue = getFutureVersion();
- assertEquals(-1, futureValue.serialize());
+ public void testUnknownVersionSerializesToMinusOne() {
+ ComponentVersion unknownVersion = getUnknownVersion();
+ assertEquals(-1, unknownVersion.serialize());
}
- // DEFAULT_VERSION's internal version id is 0
@Test
public void testDefaultVersionSerializesToZero() {
ComponentVersion defaultValue = getDefaultVersion();
assertEquals(0, defaultValue.serialize());
}
- // known (non-future) versions are strictly increasing
+ // known versions are strictly increasing
@Test
public void testSerializedValuesAreMonotonic() {
ComponentVersion[] values = getValues();
@@ -75,7 +72,7 @@ public void testSerializedValuesAreMonotonic() {
@Test
public void testNextVersionProgression() {
ComponentVersion[] values = getValues();
- ComponentVersion futureValue = getFutureVersion();
+ ComponentVersion unknownVersion = getUnknownVersion();
int knownVersionCount = values.length - 1;
for (int i = 0; i < knownVersionCount - 1; i++) {
assertEquals(values[i + 1], values[i].nextVersion(),
@@ -83,8 +80,8 @@ public void testNextVersionProgression() {
}
assertNull(values[knownVersionCount - 1].nextVersion(),
"Expected latest known version to have no nextVersion");
- assertNull(futureValue.nextVersion(),
- "Expected FUTURE_VERSION.nextVersion() to return null");
+ assertNull(unknownVersion.nextVersion(),
+ "Expected unknown version to have no nextVersion");
}
@Test
@@ -105,18 +102,19 @@ public void
testOnlyEqualOrHigherVersionsCanSupportAFeature() {
}
@Test
- public void testFutureVersionSupportsAllKnownVersions() {
+ public void testUnknownFutureVersionSupportsAllKnownVersions() {
ComponentVersion[] values = getValues();
- int unknownFutureVersion = Integer.MAX_VALUE;
+ int unknownSerializedVersion = Integer.MAX_VALUE;
for (ComponentVersion knownVersion : values) {
- if (knownVersion == getFutureVersion()) {
- // FUTURE_VERSION with serialized value < 0 is considered larger than
any version with a concrete
- // positive value.
- assertFalse(knownVersion.isSupportedBy(unknownFutureVersion),
knownVersion +
- " should not support unknown future version " +
unknownFutureVersion);
+ if (knownVersion == getUnknownVersion()) {
+ // Two unknown future versions should not support each other.
+ assertFalse(knownVersion.isSupportedBy(unknownSerializedVersion),
knownVersion +
+ " should not support unknown future version " +
unknownSerializedVersion);
} else {
- assertTrue(knownVersion.isSupportedBy(unknownFutureVersion),
knownVersion +
- " should support unknown future version " + unknownFutureVersion);
+ // The unknown future version should deserialize to a negative value,
but still be considered larger than all
+ // known versions.
+ assertTrue(knownVersion.isSupportedBy(unknownSerializedVersion),
knownVersion +
+ " should support unknown future version " +
unknownSerializedVersion);
}
}
}
@@ -129,7 +127,7 @@ public void testVersionSerDes() {
}
@Test
- public void testDeserializeUnknownReturnsFutureVersion() {
- assertEquals(getFutureVersion(), deserialize(Integer.MAX_VALUE));
+ public void testDeserializeUnknownVersion() {
+ assertEquals(getUnknownVersion(), deserialize(Integer.MAX_VALUE));
}
}
diff --git
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestClientVersion.java
b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestClientVersion.java
index 721fb2466c9..b9fc7698888 100644
---
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestClientVersion.java
+++
b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestClientVersion.java
@@ -35,7 +35,7 @@ protected ComponentVersion getDefaultVersion() {
}
@Override
- protected ComponentVersion getFutureVersion() {
+ protected ComponentVersion getUnknownVersion() {
return ClientVersion.FUTURE_VERSION;
}
diff --git
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestHDDSVersion.java
b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestHDDSVersion.java
index d5bb06571be..38c0ee3a4dc 100644
---
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestHDDSVersion.java
+++
b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestHDDSVersion.java
@@ -37,7 +37,7 @@ protected ComponentVersion getDefaultVersion() {
}
@Override
- protected ComponentVersion getFutureVersion() {
+ protected ComponentVersion getUnknownVersion() {
return HDDSVersion.UNKNOWN_VERSION;
}
diff --git
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestOzoneManagerVersion.java
b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestOzoneManagerVersion.java
index cb5bd94198c..c740154211d 100644
---
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestOzoneManagerVersion.java
+++
b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestOzoneManagerVersion.java
@@ -38,7 +38,7 @@ protected ComponentVersion getDefaultVersion() {
}
@Override
- protected ComponentVersion getFutureVersion() {
+ protected ComponentVersion getUnknownVersion() {
return OzoneManagerVersion.UNKNOWN_VERSION;
}
diff --git
a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSLayoutFeature.java
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSLayoutFeature.java
index e1853c0b4bb..b8a0662d31a 100644
---
a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSLayoutFeature.java
+++
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSLayoutFeature.java
@@ -98,11 +98,11 @@ public void testIsSupportedByFeatureBoundary() {
}
@Test
- public void testAllLayoutFeaturesAreSupportedByFutureVersions() {
+ public void testAllLayoutFeaturesAreSupportedByUnknownFutureVersions() {
for (HDDSLayoutFeature feature : HDDSLayoutFeature.values()) {
assertSupportedBy(feature, HDDSVersion.ZDU);
assertSupportedBy(feature, HDDSVersion.UNKNOWN_VERSION);
- // No ComponentVersion instance represents an arbitrary future version.
+ // No ComponentVersion instance represents an arbitrary unknown version.
assertTrue(feature.isSupportedBy(Integer.MAX_VALUE));
}
}
diff --git
a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
index 5c3a3328782..7ffa96d6c42 100644
---
a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
+++
b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
@@ -362,9 +362,8 @@ public static OzoneManagerVersion
getOmVersion(ServiceInfoEx info) {
static boolean validateOmVersion(OzoneManagerVersion minimumVersion,
List<ServiceInfo> serviceInfoList) {
if (minimumVersion == OzoneManagerVersion.UNKNOWN_VERSION) {
- // A FUTURE_VERSION should not be expected ever.
throw new IllegalArgumentException("Configuration error, expected "
- + "OzoneManager version config evaluates to a future version.");
+ + "OzoneManager version config evaluates to an unknown version.");
}
// if expected version is unset or is the default, then any OM would do
fine
if (minimumVersion == null
diff --git
a/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/rpc/TestRpcClient.java
b/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/rpc/TestRpcClient.java
index c6d99697111..92da86f4b22 100644
---
a/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/rpc/TestRpcClient.java
+++
b/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/rpc/TestRpcClient.java
@@ -210,7 +210,7 @@ public void
testValidateOmVersion(ValidateOmVersionTestCases testCase) {
}
@Test
- public void testFutureVersionShouldNotBeAnExpectedVersion() {
+ public void testUnknownVersionShouldNotBeAnExpectedVersion() {
assertThrows(
IllegalArgumentException.class,
() -> validateOmVersion(OzoneManagerVersion.UNKNOWN_VERSION, null));
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMLayoutFeature.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMLayoutFeature.java
index 9534c0ccba1..6f16cb2726e 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMLayoutFeature.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMLayoutFeature.java
@@ -98,7 +98,7 @@ public void testIsSupportedByFeatureBoundary() {
}
@Test
- public void testAllLayoutFeaturesAreSupportedByFutureVersions() {
+ public void testAllLayoutFeaturesAreSupportedByUnknownFutureVersions() {
for (OMLayoutFeature feature : OMLayoutFeature.values()) {
assertSupportedBy(feature, OzoneManagerVersion.ZDU);
assertSupportedBy(feature, OzoneManagerVersion.UNKNOWN_VERSION);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
