Skip to content

HDDS-10512. Refactor initialization of ScmTopologyClient in OM #6374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 1 commit into from
Mar 14, 2024
Merged

HDDS-10512. Refactor initialization of ScmTopologyClient in OM #6374

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -1696,19 +1695,14 @@ public void start() throws IOException {
metricsTimer = new Timer();
metricsTimer.schedule(scheduleOMMetricsWriteTask, 0, period);

keyManager.start(configuration);

try {
scmTopologyClient.start(configuration);
} catch (IOException ex) {
LOG.error("Unable to initialize network topology schema file. ", ex);
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);
Expand Down