HDFS-13301. Ozone: Remove containerPort, ratisPort and ozoneRestPort from DatanodeID and DatanodeIDProto. Contributed by Shashikant Banerjee.

hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelperClient.java

@@ -336,9 +336,7 @@ public class PBHelperClient {
             dn.getDatanodeUuid() : "")
         .setInfoPort(dn.getInfoPort())
         .setInfoSecurePort(dn.getInfoSecurePort())
-        .setIpcPort(dn.getIpcPort())
-        .setOzoneRestPort(dn.getOzoneRestPort())
-        .build();
+        .setIpcPort(dn.getIpcPort()).build();
   }
 
   public static DatanodeInfoProto.AdminState convert(
@@ -788,13 +786,9 @@ public class PBHelperClient {
 
   // DatanodeId
   public static DatanodeID convert(DatanodeIDProto dn) {
-    DatanodeID datanodeID =
-        new DatanodeID(dn.getIpAddr(), dn.getHostName(), dn.getDatanodeUuid(),
-            dn.getXferPort(), dn.getInfoPort(),
-            dn.hasInfoSecurePort() ? dn.getInfoSecurePort() : 0,
-            dn.getIpcPort());
-    datanodeID.setOzoneRestPort(dn.getOzoneRestPort());
-    return datanodeID;
+    return new DatanodeID(dn.getIpAddr(), dn.getHostName(),
+        dn.getDatanodeUuid(), dn.getXferPort(), dn.getInfoPort(),
+        dn.hasInfoSecurePort() ? dn.getInfoSecurePort() : 0, dn.getIpcPort());
   }
 
   public static AdminStates convert(AdminState adminState) {

hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/hdfs.proto

@@ -73,9 +73,6 @@ message DatanodeIDProto {
   required uint32 infoPort = 5;  // datanode http port
   required uint32 ipcPort = 6;   // ipc server port
   optional uint32 infoSecurePort = 7 [default = 0]; // datanode https port
-  optional uint32 containerPort = 8 [default = 0]; // Ozone stand_alone protocol
-  optional uint32 ratisPort = 9 [default = 0]; //Ozone ratis port
-  optional uint32 ozoneRestPort = 10 [default = 0];
 }
 
 /**