Skip to content

HDDS-4047. OzoneManager met NPE exception while getServiceList #1277

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
xiaoyuyao merged 2 commits into from
Jul 30, 2020
Merged

HDDS-4047. OzoneManager met NPE exception while getServiceList #1277

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e9d37b
HDDS-4047. OzoneManager met NPE exception while getServiceList
maobaolong Jul 30, 2020
9f52a1f
trigger new ci check
maobaolong Jul 30, 2020
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
18 changes: 12 additions & 6 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 @@ -1147,15 +1147,17 @@ public void start() throws IOException {
metricsTimer.schedule(scheduleOMMetricsWriteTask, 0, period);

keyManager.start(configuration);
omRpcServer.start();
isOmRpcServerRunning = true;

try {
httpServer = new OzoneManagerHttpServer(configuration, this);
httpServer.start();
} catch (Exception ex) {
// 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();
Expand Down Expand Up @@ -1201,8 +1203,6 @@ public void restart() throws IOException {
}

omRpcServer = getRpcServer(configuration);
omRpcServer.start();
isOmRpcServerRunning = true;

try {
httpServer = new OzoneManagerHttpServer(configuration, this);
Expand All @@ -1211,6 +1211,10 @@ public void restart() throws IOException {
// 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();
Expand Down Expand Up @@ -2503,13 +2507,15 @@ public List<ServiceInfo> getServiceList() throws IOException {
.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())
Expand Down