Updated Branches: refs/heads/trunk 3f688723b -> 69a97d479
AMBARI-3199. NPE during opening UI on cluster w/o Ganglia. (odiachenko) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/69a97d47 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/69a97d47 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/69a97d47 Branch: refs/heads/trunk Commit: 69a97d479ac972a65b34f7f9bae68578a1b25853 Parents: 3f68872 Author: Oleksandr Diachenko <[email protected]> Authored: Thu Sep 12 16:59:21 2013 +0300 Committer: Oleksandr Diachenko <[email protected]> Committed: Thu Sep 12 16:59:49 2013 +0300 ---------------------------------------------------------------------- .../controller/internal/AbstractProviderModule.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/69a97d47/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java index e0bf0df..d7272df 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java @@ -266,14 +266,16 @@ public abstract class AbstractProviderModule implements ProviderModule, Resource public boolean evaluate(Object hostResponse) { return ((HostResponse) hostResponse).getHostname().equals(gangliaCollectorHostName); } - }); + }); } catch (AmbariException e) { LOG.debug("Error checking of Ganglia server host live status: ", e); return false; } - LOG.debug("Host state: " + gangliaCollectorHost.getHostState()); - + //Cluster without Ganglia + if (gangliaCollectorHost == null) + return false; + return !gangliaCollectorHost.getHostState().equals(HostState.HEARTBEAT_LOST.name()); } @@ -303,6 +305,10 @@ public abstract class AbstractProviderModule implements ProviderModule, Resource return false; } + //Cluster without Ganglia + if (gangliaCollectorHostComponent == null) + return false; + return gangliaCollectorHostComponent.getLiveState().equals(State.STARTED.name()); }
