You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/05/28 00:45:13 UTC

[2/4] git commit: HA master promotion: avoid NPE if no valid masters

HA master promotion: avoid NPE if no valid masters


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/cd75ce8b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/cd75ce8b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/cd75ce8b

Branch: refs/heads/master
Commit: cd75ce8b669f98eb48798b66ccc08e9f229fc918
Parents: 30aea3c
Author: Aled Sage <al...@gmail.com>
Authored: Wed May 21 17:23:25 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue May 27 22:32:38 2014 +0100

----------------------------------------------------------------------
 .../java/brooklyn/management/ha/HighAvailabilityManagerImpl.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cd75ce8b/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java b/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java
index ebb015b..b941a95 100644
--- a/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java
+++ b/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java
@@ -368,7 +368,8 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager {
         }
         
         // Need to choose a new master
-        String newMasterNodeId = masterChooser.choose(memento, heartbeatTimeout, ownNodeId, now).getNodeId();
+        ManagementNodeSyncRecord newMasterRecord = masterChooser.choose(memento, heartbeatTimeout, ownNodeId, now);
+        String newMasterNodeId = (newMasterRecord == null) ? null : newMasterRecord.getNodeId();
         boolean newMasterIsSelf = ownNodeId.equals(newMasterNodeId);
         
         LOG.warn("Management node master-promotion required: newMaster={}; oldMaster={}; plane={}, self={}; heartbeatTimeout={}",