You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ch...@apache.org on 2026/10/22 11:24:44 UTC
(ozone) branch master updated: HDDS-16245. Remove redundant RPC metadata from StorageContainerDatanodeProtocol (#11663)
This is an automated email from the ASF dual-hosted git repository.
chihsuan 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 5331a5cfd1d HDDS-16245. Remove redundant RPC metadata from StorageContainerDatanodeProtocol (#11663)
5331a5cfd1d is described below
commit 5331a5cfd1d1f6568f609e9d2bd9cfdd07a25dee
Author: Eric C. Ho <ec...@gmail.com>
AuthorDate: Thu Oct 22 19:24:37 2026 +0800
HDDS-16245. Remove redundant RPC metadata from StorageContainerDatanodeProtocol (#11663)
---
.../protocol/StorageContainerDatanodeProtocol.java | 10 -----
.../TestStorageContainerDatanodeProtocolPB.java | 48 ++++++++++++++++++++++
2 files changed, 48 insertions(+), 10 deletions(-)
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/StorageContainerDatanodeProtocol.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/StorageContainerDatanodeProtocol.java
index 1d75ef3208e..128a96e3a72 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/StorageContainerDatanodeProtocol.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/StorageContainerDatanodeProtocol.java
@@ -30,24 +30,14 @@
import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.SCMRegisteredResponseProto;
import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.SCMVersionRequestProto;
import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.SCMVersionResponseProto;
-import org.apache.hadoop.hdds.scm.ScmConfig;
-import org.apache.hadoop.security.KerberosInfo;
/**
* The protocol spoken between datanodes and SCM. For specifics please the
* Protoc file that defines this protocol.
*/
-@KerberosInfo(
- serverPrincipal = ScmConfig.ConfigStrings.HDDS_SCM_KERBEROS_PRINCIPAL_KEY)
@InterfaceAudience.Private
public interface StorageContainerDatanodeProtocol {
- @SuppressWarnings("checkstyle:ConstantName")
- /**
- * Version 1: Initial version.
- */
- long versionID = 1L;
-
/**
* Returns SCM version.
* @return Version info.
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/protocolPB/TestStorageContainerDatanodeProtocolPB.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/protocolPB/TestStorageContainerDatanodeProtocolPB.java
new file mode 100644
index 00000000000..b698bf25cc1
--- /dev/null
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/protocolPB/TestStorageContainerDatanodeProtocolPB.java
@@ -0,0 +1,48 @@
+/*
+ * 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.ozone.protocolPB;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.apache.hadoop.hdds.HddsConfigKeys;
+import org.apache.hadoop.hdds.scm.ScmConfig;
+import org.apache.hadoop.ipc_.RPC;
+import org.apache.hadoop.ozone.protocol.StorageContainerDatanodeProtocol;
+import org.apache.hadoop.security.KerberosInfo;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Tests the Hadoop RPC metadata for the SCM datanode protocol.
+ */
+public class TestStorageContainerDatanodeProtocolPB {
+
+ private static final String PROTOCOL_NAME = "org.apache.hadoop.ozone.protocol.StorageContainerDatanodeProtocol";
+
+ @Test
+ public void testProtocolMetadata() {
+ assertEquals(PROTOCOL_NAME, StorageContainerDatanodeProtocol.class.getName());
+ assertEquals(PROTOCOL_NAME, RPC.getProtocolName(StorageContainerDatanodeProtocolPB.class));
+ assertEquals(1L, RPC.getProtocolVersion(StorageContainerDatanodeProtocolPB.class));
+
+ KerberosInfo kerberosInfo = StorageContainerDatanodeProtocolPB.class.getAnnotation(KerberosInfo.class);
+ assertNotNull(kerberosInfo);
+ assertEquals(ScmConfig.ConfigStrings.HDDS_SCM_KERBEROS_PRINCIPAL_KEY, kerberosInfo.serverPrincipal());
+ assertEquals(HddsConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY, kerberosInfo.clientPrincipal());
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org