This is an automated email from the ASF dual-hosted git repository.
xyao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new a95b0b8 HDDS-4047. OzoneManager met NPE exception while
getServiceList (#1277)
a95b0b8 is described below
commit a95b0b8580ae2b3d093505efd85eeb31117467e2
Author: maobaolong <[email protected]>
AuthorDate: Fri Jul 31 07:37:31 2020 +0800
HDDS-4047. OzoneManager met NPE exception while getServiceList (#1277)
---
.../java/org/apache/hadoop/ozone/om/OzoneManager.java | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 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 3aa6b03..01340cd 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
@@ -1147,8 +1147,7 @@ public final class OzoneManager extends
ServiceRuntimeInfoImpl
metricsTimer.schedule(scheduleOMMetricsWriteTask, 0, period);
keyManager.start(configuration);
- omRpcServer.start();
- isOmRpcServerRunning = true;
+
try {
httpServer = new OzoneManagerHttpServer(configuration, this);
httpServer.start();
@@ -1156,6 +1155,9 @@ public final class OzoneManager extends
ServiceRuntimeInfoImpl
// Allow OM to start as Http Server failure is not fatal.
LOG.error("OM HttpServer failed to start.", ex);
}
+ omRpcServer.start();
+ isOmRpcServerRunning = true;
+
registerMXBean();
startJVMPauseMonitor();
@@ -1201,8 +1203,6 @@ public final class OzoneManager extends
ServiceRuntimeInfoImpl
}
omRpcServer = getRpcServer(configuration);
- omRpcServer.start();
- isOmRpcServerRunning = true;
try {
httpServer = new OzoneManagerHttpServer(configuration, this);
@@ -1211,6 +1211,10 @@ public final class OzoneManager extends
ServiceRuntimeInfoImpl
// Allow OM to start as Http Server failure is not fatal.
LOG.error("OM HttpServer failed to start.", ex);
}
+
+ omRpcServer.start();
+ isOmRpcServerRunning = true;
+
registerMXBean();
startJVMPauseMonitor();
@@ -2503,13 +2507,15 @@ public final class OzoneManager extends
ServiceRuntimeInfoImpl
.setType(ServicePort.Type.RPC)
.setValue(omRpcAddress.getPort())
.build());
- if (httpServer.getHttpAddress() != null) {
+ if (httpServer != null
+ && httpServer.getHttpAddress() != null) {
omServiceInfoBuilder.addServicePort(ServicePort.newBuilder()
.setType(ServicePort.Type.HTTP)
.setValue(httpServer.getHttpAddress().getPort())
.build());
}
- if (httpServer.getHttpsAddress() != null) {
+ if (httpServer != null
+ && httpServer.getHttpsAddress() != null) {
omServiceInfoBuilder.addServicePort(ServicePort.newBuilder()
.setType(ServicePort.Type.HTTPS)
.setValue(httpServer.getHttpsAddress().getPort())
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
