This is an automated email from the ASF dual-hosted git repository.
chungen0126 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 a65fe53821f HDDS-16192. Refactor o.a.h.hdds.scm.protocol (#11070)
a65fe53821f is described below
commit a65fe53821feaecf2b6ed865b4f69883a8ec8afc
Author: Eric C. Ho <[email protected]>
AuthorDate: Fri Aug 21 05:10:33 2026 +0800
HDDS-16192. Refactor o.a.h.hdds.scm.protocol (#11070)
---
.../protocol/StorageContainerLocationProtocol.java | 11 -----
.../TestStorageContainerLocationProtocolPB.java | 47 ++++++++++++++++++++++
2 files changed, 47 insertions(+), 11 deletions(-)
diff --git
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocol.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocol.java
index cae99a27fca..70b758ef1c4 100644
---
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocol.java
+++
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocol.java
@@ -38,7 +38,6 @@
import
org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.StartContainerBalancerResponseProto;
import
org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.Type;
import org.apache.hadoop.hdds.scm.DatanodeAdminError;
-import org.apache.hadoop.hdds.scm.ScmConfig;
import org.apache.hadoop.hdds.scm.ScmInfo;
import org.apache.hadoop.hdds.scm.container.ContainerID;
import org.apache.hadoop.hdds.scm.container.ContainerInfo;
@@ -47,24 +46,14 @@
import
org.apache.hadoop.hdds.scm.container.common.helpers.ContainerWithPipeline;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.ozone.upgrade.UpgradeFinalization.StatusAndMessages;
-import org.apache.hadoop.security.KerberosInfo;
import org.apache.hadoop.security.token.Token;
/**
* ContainerLocationProtocol is used by an HDFS node to find the set of nodes
* that currently host a container.
*/
-@KerberosInfo(serverPrincipal = ScmConfig.ConfigStrings
- .HDDS_SCM_KERBEROS_PRINCIPAL_KEY)
public interface StorageContainerLocationProtocol extends Closeable {
- // Accessed and checked via reflection in Hadoop RPC - changing it is
incompatible
- @SuppressWarnings({"checkstyle:ConstantName", "unused"})
- /**
- * Version 1: Initial version.
- */
- long versionID = 1L;
-
/**
* Admin command should take effect on all SCM instance.
*/
diff --git
a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/scm/protocolPB/TestStorageContainerLocationProtocolPB.java
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/scm/protocolPB/TestStorageContainerLocationProtocolPB.java
new file mode 100644
index 00000000000..7c88043a225
--- /dev/null
+++
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/scm/protocolPB/TestStorageContainerLocationProtocolPB.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hdds.scm.protocolPB;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.apache.hadoop.hdds.scm.ScmConfig;
+import org.apache.hadoop.hdds.scm.protocol.StorageContainerLocationProtocol;
+import org.apache.hadoop.ipc_.RPC;
+import org.apache.hadoop.security.KerberosInfo;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Tests the Hadoop RPC metadata for the SCM container location protocol.
+ */
+public class TestStorageContainerLocationProtocolPB {
+
+ @Test
+ public void testProtocolMetadata() {
+ assertEquals(StorageContainerLocationProtocol.class.getName(),
+ RPC.getProtocolName(StorageContainerLocationProtocolPB.class));
+ assertEquals(1L,
+ RPC.getProtocolVersion(StorageContainerLocationProtocolPB.class));
+
+ KerberosInfo kerberosInfo = StorageContainerLocationProtocolPB.class
+ .getAnnotation(KerberosInfo.class);
+ assertNotNull(kerberosInfo);
+ assertEquals(ScmConfig.ConfigStrings.HDDS_SCM_KERBEROS_PRINCIPAL_KEY,
+ kerberosInfo.serverPrincipal());
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
