This is an automated email from the ASF dual-hosted git repository.
szetszwo 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 9f7dcd839e5 HDDS-16244. Remove redundant RPC metadata from
SCMSecurityProtocol (#11079)
9f7dcd839e5 is described below
commit 9f7dcd839e5447f07a19494f13cdd5257fcf9deb
Author: Eric C. Ho <[email protected]>
AuthorDate: Sun Aug 23 00:24:49 2026 +0800
HDDS-16244. Remove redundant RPC metadata from SCMSecurityProtocol (#11079)
---
.../hadoop/hdds/protocol/SCMSecurityProtocol.java | 10 -----
.../hdds/protocolPB/TestSCMSecurityProtocolPB.java | 50 ++++++++++++++++++++++
2 files changed, 50 insertions(+), 10 deletions(-)
diff --git
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SCMSecurityProtocol.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SCMSecurityProtocol.java
index 5da52fe79ea..c7dfa838734 100644
---
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SCMSecurityProtocol.java
+++
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SCMSecurityProtocol.java
@@ -25,23 +25,13 @@
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeDetailsProto;
import
org.apache.hadoop.hdds.protocol.proto.HddsProtos.OzoneManagerDetailsProto;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ScmNodeDetailsProto;
-import org.apache.hadoop.hdds.scm.ScmConfig;
-import org.apache.hadoop.security.KerberosInfo;
/**
* The protocol used to perform security related operations with SCM.
*/
-@KerberosInfo(
- serverPrincipal = ScmConfig.ConfigStrings.HDDS_SCM_KERBEROS_PRINCIPAL_KEY)
@InterfaceAudience.Private
public interface SCMSecurityProtocol {
- @SuppressWarnings("checkstyle:ConstantName")
- /**
- * Version 1: Initial version.
- */
- long versionID = 1L;
-
/**
* Get SCM signed certificate for DataNode.
*
diff --git
a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/protocolPB/TestSCMSecurityProtocolPB.java
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/protocolPB/TestSCMSecurityProtocolPB.java
new file mode 100644
index 00000000000..81968a85e1a
--- /dev/null
+++
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/protocolPB/TestSCMSecurityProtocolPB.java
@@ -0,0 +1,50 @@
+/*
+ * 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.protocolPB;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.apache.hadoop.hdds.protocol.SCMSecurityProtocol;
+import org.apache.hadoop.hdds.scm.ScmConfig;
+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 security protocol.
+ */
+public class TestSCMSecurityProtocolPB {
+
+ private static final String PROTOCOL_NAME =
+ "org.apache.hadoop.hdds.protocol.SCMSecurityProtocol";
+
+ @Test
+ public void testProtocolMetadata() {
+ assertEquals(PROTOCOL_NAME, SCMSecurityProtocol.class.getName());
+ assertEquals(PROTOCOL_NAME,
+ RPC.getProtocolName(SCMSecurityProtocolPB.class));
+ assertEquals(1L, RPC.getProtocolVersion(SCMSecurityProtocolPB.class));
+
+ KerberosInfo kerberosInfo = SCMSecurityProtocolPB.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]
