Quellcode durchsuchen

AMBARI-3199. NPE during opening UI on cluster w/o Ganglia. (odiachenko)

Oleksandr Diachenko vor 11 Jahren
Ursprung
Commit
69a97d479a

+ 9 - 3
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());
   }