From 289e725c867be72446bafa3c875317eb62ade9e2 Mon Sep 17 00:00:00 2001
From: tanvipenumudy <tanvi.penumudy@cloudera.com>
Date: Wed, 13 Mar 2024 13:50:01 +0530
Subject: [PATCH] HDDS-10512. Refactor initialization of ScmTopologyClient in
 OM

---
 .../java/org/apache/hadoop/ozone/om/OzoneManager.java     | 8 +-------
 1 file changed, 1 insertion(+), 7 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
index c27ba7836bf5..13e61ce61c21 100644
--- 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
@@ -391,7 +391,6 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
   private OzoneManagerHttpServer httpServer;
   private final OMStorage omStorage;
   private ObjectName omInfoBeanName;
-  private NetworkTopology clusterMap;
   private Timer metricsTimer;
   private ScheduleOMMetricsWriteTask scheduleOMMetricsWriteTask;
   private static final ObjectWriter WRITER =
@@ -1696,8 +1695,6 @@ public void start() throws IOException {
     metricsTimer = new Timer();
     metricsTimer.schedule(scheduleOMMetricsWriteTask, 0, period);
 
-    keyManager.start(configuration);
-
     try {
       scmTopologyClient.start(configuration);
     } catch (IOException ex) {
@@ -1705,10 +1702,7 @@ public void start() throws IOException {
       throw new UncheckedIOException(ex);
     }
 
-    clusterMap = new NetworkTopologyImpl(configuration.get(
-        ScmConfigKeys.OZONE_SCM_NETWORK_TOPOLOGY_SCHEMA_FILE,
-        ScmConfigKeys.OZONE_SCM_NETWORK_TOPOLOGY_SCHEMA_FILE_DEFAULT),
-        scmTopologyClient.getClusterTree());
+    keyManager.start(configuration);
 
     try {
       httpServer = new OzoneManagerHttpServer(configuration, this);