andreacavalli/scylla-jmx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FailureDetector: check that states is not null before use

Browse Source 
When a node is part of a cluster but is down (like in the situation where
a cluster is taken down and up again but not all nodes are up). There is
no application_state information for that node.

This patch check that the information exists before using it to prevent
null pointer exception.

After this patch, a call to nodetool gossipinfo would return the
available information without failing.

See scylladb/scylla#3330

Signed-off-by: Amnon Heiman <amnon@scylladb.com>
Message-Id: <20180329115345.29357-1-amnon@scylladb.com>
(cherry picked from commit 4e4589ba6f)
This commit is contained in:
Amnon Heiman 2018-03-29 14:53:45 +03:00 committed by Avi Kivity
parent f6f03172f1
commit 5aaa5faee7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/apache/cassandra/gms/FailureDetector.java
View File

@ -105,9 +105,11 @@ public class FailureDetector extends APIMBean implements FailureDetectorMBean {
ep.setAliave(obj.getBoolean("is_alive")); ep.setAliave(obj.getBoolean("is_alive"));
ep.setUpdateTimestamp(obj.getJsonNumber("update_time").longValue()); ep.setUpdateTimestamp(obj.getJsonNumber("update_time").longValue());
JsonArray states = obj.getJsonArray("application_state"); JsonArray states = obj.getJsonArray("application_state");
for (int j = 0; j < states.size(); j++) { if (states != null) {
JsonObject state = states.getJsonObject(j); for (int j = 0; j < states.size(); j++) {
ep.addApplicationState(state.getInt("application_state"), state.getString("value")); JsonObject state = states.getJsonObject(j);
ep.addApplicationState(state.getInt("application_state"), state.getString("value"));
}
} }
res.put(obj.getString("addrs"), ep); res.put(obj.getString("addrs"), ep);
} }