This is an automated email from the ASF dual-hosted git repository.
msingh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new dba2d54 HDDS-5421. SCM throws NPE during JMX call. (#2398)
dba2d54 is described below
commit dba2d54520e2b72789a9934a20271eab4b9a7eba
Author: Nandakumar <[email protected]>
AuthorDate: Mon Jul 12 09:42:51 2021 +0530
HDDS-5421. SCM throws NPE during JMX call. (#2398)
---
.../org/apache/hadoop/hdds/scm/server/StorageContainerManager.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
index b75112c..ad361fd 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
@@ -48,6 +48,7 @@ import org.apache.hadoop.hdds.scm.ha.SCMHAManager;
import org.apache.hadoop.hdds.scm.ha.SCMHAManagerImpl;
import org.apache.hadoop.hdds.scm.ha.SCMHANodeDetails;
import org.apache.hadoop.hdds.scm.ha.SCMNodeInfo;
+import org.apache.hadoop.hdds.scm.ha.SCMRatisServer;
import org.apache.hadoop.hdds.scm.ha.SCMServiceManager;
import org.apache.hadoop.hdds.scm.ha.SCMNodeDetails;
import org.apache.hadoop.hdds.scm.ha.SCMRatisServerImpl;
@@ -1780,7 +1781,9 @@ public final class StorageContainerManager extends
ServiceRuntimeInfoImpl
@Override
public String getScmRatisRoles() throws IOException {
- return
HddsUtils.format(getScmHAManager().getRatisServer().getRatisRoles());
+ final SCMRatisServer server = getScmHAManager().getRatisServer();
+ return server != null ?
+ HddsUtils.format(server.getRatisRoles()) : "STANDALONE";
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
