This is an automated email from the ASF dual-hosted git repository.
weichiu 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 6224fd6d6a HDDS-13264. Fix OzoneTokenIdentifier to correctly handle
missing omServiceId field (#8842)
6224fd6d6a is described below
commit 6224fd6d6a803b4a8c658fccce7a769e97a2d4f8
Author: sreejasahithi <[email protected]>
AuthorDate: Tue Jul 29 02:49:51 2025 +0530
HDDS-13264. Fix OzoneTokenIdentifier to correctly handle missing
omServiceId field (#8842)
---
.../apache/hadoop/ozone/security/OzoneTokenIdentifier.java | 4 +++-
.../hadoop/ozone/security/TestOzoneTokenIdentifier.java | 11 ++++++++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/OzoneTokenIdentifier.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/OzoneTokenIdentifier.java
index 9c26f16838..a21c979787 100644
---
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/OzoneTokenIdentifier.java
+++
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/OzoneTokenIdentifier.java
@@ -225,7 +225,9 @@ public static OzoneTokenIdentifier readProtoBuf(DataInput
in)
if (token.hasSecretKeyId()) {
identifier.setSecretKeyId(token.getSecretKeyId());
}
- identifier.setOmServiceId(token.getOmServiceId());
+ if (token.hasOmServiceId()) {
+ identifier.setOmServiceId(token.getOmServiceId());
+ }
return identifier;
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestOzoneTokenIdentifier.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestOzoneTokenIdentifier.java
index ab02e75206..21ea290dde 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestOzoneTokenIdentifier.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestOzoneTokenIdentifier.java
@@ -55,6 +55,8 @@
import org.apache.hadoop.util.Time;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -282,10 +284,13 @@ public void testTokenSerialization() throws IOException {
assertEquals(idEncode, idDecode);
}
- @Test
- void testTokenPersistence() throws IOException {
+ @ParameterizedTest
+ @CsvSource({"true", "false"})
+ void testTokenPersistence(boolean isOMServiceIdGiven) throws IOException {
OzoneTokenIdentifier idWrite = getIdentifierInst();
- idWrite.setOmServiceId("defaultServiceId");
+ if (isOMServiceIdGiven) {
+ idWrite.setOmServiceId("defaultServiceId");
+ }
byte[] oldIdBytes = idWrite.getBytes();
Codec<OzoneTokenIdentifier> idCodec = TokenIdentifierCodec.get();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
