reposition clusterMap initialization

apache · Oct 11, 2023 · d42242a · d42242a
1 parent 862dcd5
commit d42242a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -611,8 +611,6 @@ private OzoneManager(OzoneConfiguration conf, StartupOption startupOption)
         configuration);
     this.ozoneLockProvider = new OzoneLockProvider(getKeyPathLockEnabled(),
         getEnableFileSystemPaths());
-    clusterMap = new NetworkTopologyImpl(
-        scmBlockLocationClient.getTopologyInformation());
 
     // For testing purpose only, not hit scm from om as Hadoop UGI can't login
     // two principals in the same JVM.
@@ -1716,6 +1714,9 @@ public void start() throws IOException {
       throw new UncheckedIOException(ex);
     }
 
+    clusterMap = new NetworkTopologyImpl(
+        scmBlockLocationClient.getTopologyInformation());
+
     try {
       httpServer = new OzoneManagerHttpServer(configuration, this);
       httpServer.start();

diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerUnit.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerUnit.java
@@ -137,6 +137,7 @@ public void cleanup() throws Exception {
   @Test
   public void listMultipartUploadPartsWithZeroUpload() throws IOException {
     //GIVEN
+    System.out.println(writeClient.refetchTopologyInformation());
     createBucket(metadataManager, "vol1", "bucket1");
 
     OmMultipartInfo omMultipartInfo =