HDDS-11396. NPE due to empty Handler#clusterId (apache#7145)

aswinshakil · Sep 20, 2024 · 719bdf9 · 719bdf9
1 parent 40c4001
commit 719bdf9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...r-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/HddsDispatcher.java b/...r-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/HddsDispatcher.java
@@ -647,7 +647,7 @@ public Handler getHandler(ContainerProtos.ContainerType containerType) {
 
   @Override
   public void setClusterId(String clusterId) {
-    Preconditions.checkNotNull(clusterId, "clusterId Cannot be null");
+    Preconditions.checkNotNull(clusterId, "clusterId cannot be null");
     if (this.clusterId == null) {
       this.clusterId = clusterId;
       for (Map.Entry<ContainerType, Handler> handlerMap : handlers.entrySet()) {

diff --git a/...ner-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java b/...ner-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java
@@ -478,10 +478,10 @@ public void start(String clusterId) throws IOException {
     replicationServer.start();
     datanodeDetails.setPort(Name.REPLICATION, replicationServer.getPort());
 
-    writeChannel.start();
-    readChannel.start();
     hddsDispatcher.init();
     hddsDispatcher.setClusterId(clusterId);
+    writeChannel.start();
+    readChannel.start();
     blockDeletingService.start();
     recoveringContainerScrubbingService.start();