Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDDS-908: NPE in TestOzoneRpcClient. 

Contributed by Ajay Kumar.
This commit is contained in:
Anu Engineer 2018-12-17 12:17:09 -08:00
parent 71e0b0d800
commit 5426653819
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
View File

@ -1438,11 +1438,14 @@ public List<ServiceInfo> getServiceList() throws IOException {
.setNodeType(HddsProtos.NodeType.DATANODE) .setNodeType(HddsProtos.NodeType.DATANODE)
.setHostname(datanode.getHostName()); .setHostname(datanode.getHostName());
dnServiceInfoBuilder.addServicePort(ServicePort.newBuilder() if(DatanodeDetails.getFromProtoBuf(datanode)
.setType(ServicePort.Type.HTTP) .getPort(DatanodeDetails.Port.Name.REST) != null) {
.setValue(DatanodeDetails.getFromProtoBuf(datanode) dnServiceInfoBuilder.addServicePort(ServicePort.newBuilder()
.getPort(DatanodeDetails.Port.Name.REST).getValue()) .setType(ServicePort.Type.HTTP)
.build()); .setValue(DatanodeDetails.getFromProtoBuf(datanode)
.getPort(DatanodeDetails.Port.Name.REST).getValue())
.build());
}
services.add(dnServiceInfoBuilder.build()); services.add(dnServiceInfoBuilder.build());
} }