AMBARI-1463 - State of HBase region server not updated when instance is shut down on a cluster not installed via Ambari.

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1450339 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -376,6 +376,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1463. State of HBase region server not updated when instance is shut down on a cluster not installed via Ambari. (tbeerbower)
+ 
  AMBARI-1494. Browser memory consumption issues. (jaimin)
 
  AMBARI-1480. Comparison predicate should account for null values. (tbeerbower)

ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/ClusterDefinition.java

@@ -68,6 +68,11 @@ public class ClusterDefinition {
    */
   private final Map<String, HostComponentState> hostComponentStateMap = new HashMap<String, HostComponentState>();
 
+  /**
+   * Expiry for the health value.
+   */
+  private static final int DEFAULT_STATE_EXPIRY = 15000;
+
   /**
    * Component name mapping to account for differences in what is provided by the gsInstaller
    * and what is expected by the Ambari providers.
@@ -82,16 +87,27 @@ public class ClusterDefinition {
 
   /**
    * Create a cluster definition.
+   *
+   * @param stateProvider  the state provider
    */
   public ClusterDefinition(GSInstallerStateProvider stateProvider) {
+    this(stateProvider, DEFAULT_STATE_EXPIRY);
+  }
+
+  /**
+   * Create a cluster definition.
+   *
+   * @param stateProvider  the state provider
+   * @param stateExpiry    the state expiry
+   */
+  public ClusterDefinition(GSInstallerStateProvider stateProvider, int stateExpiry) {
     this.stateProvider = stateProvider;
     this.clusterName   = DEFAULT_CLUSTER_NAME;
     this.versionId     = DEFAULT_VERSION_ID;
     readClusterDefinition();
-    setHostComponentState();
+    setHostComponentState(stateExpiry);
   }
 
-
   // ----- ClusterDefinition -------------------------------------------------
 
   /**
@@ -270,7 +286,7 @@ public class ClusterDefinition {
   /**
    * Set the host component state maps.
    */
-  private void setHostComponentState() {
+  private void setHostComponentState(int stateExpiry) {
     for (Map.Entry<String, Map<String, Set<String>>> serviceEntry : hostComponents.entrySet()) {
       String serviceName = serviceEntry.getKey();
 
@@ -279,7 +295,7 @@ public class ClusterDefinition {
 
         for (String componentName : hostEntry.getValue()) {
 
-          HostComponentState state = new HostComponentState(hostName, componentName);
+          HostComponentState state = new HostComponentState(hostName, componentName, stateExpiry);
 
           // add state to hosts
           addState(hostName, hostStateMap, state);
@@ -378,14 +394,10 @@ public class ClusterDefinition {
   private class HostComponentState {
     private final String hostName;
     private final String componentName;
+    private final int expiry;
     private boolean healthy = true;
     private long lastAccess;
 
-    /**
-     * Expiry for the health value.
-     */
-    private static final int EXPIRY = 15000;
-
     // ----- Constructor -----------------------------------------------------
 
     /**
@@ -394,9 +406,10 @@ public class ClusterDefinition {
      * @param hostName       the host name
      * @param componentName  the component name
      */
-    HostComponentState(String hostName, String componentName) {
+    HostComponentState(String hostName, String componentName, int expiry) {
       this.hostName      = hostName;
       this.componentName = componentName;
+      this.expiry        = expiry;
     }
 
     /**
@@ -405,7 +418,7 @@ public class ClusterDefinition {
      * @return true if the associated host component is healthy
      */
     public boolean isHealthy() {
-      if (System.currentTimeMillis() - lastAccess > EXPIRY) {
+      if (System.currentTimeMillis() - lastAccess > expiry) {
         // health value has expired... get it again
         healthy = stateProvider.isHealthy(hostName, componentName);
         this.lastAccess = System.currentTimeMillis();

ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerProviderModule.java

@@ -38,11 +38,12 @@ public class GSInstallerProviderModule extends AbstractProviderModule implements
   private static final Map<String, String> PORTS = new HashMap<String, String>();
 
   static {
-    PORTS.put("NAMENODE", "50070");
-    PORTS.put("DATANODE", "50075");
-    PORTS.put("JOBTRACKER", "50030");
-    PORTS.put("TASKTRACKER", "50060");
-    PORTS.put("HBASE_MASTER", "60010");
+    PORTS.put("NAMENODE",           "50070");
+    PORTS.put("DATANODE",           "50075");
+    PORTS.put("JOBTRACKER",         "50030");
+    PORTS.put("TASKTRACKER",        "50060");
+    PORTS.put("HBASE_MASTER",       "60010");
+    PORTS.put("HBASE_REGIONSERVER", "60030");
   }
 
   private static final int TIMEOUT = 5000;

ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java

@@ -61,11 +61,12 @@ public class JMXPropertyProvider extends AbstractPropertyProvider {
 
 
   static {
-    DEFAULT_JMX_PORTS.put("NAMENODE",     "50070");
-    DEFAULT_JMX_PORTS.put("DATANODE",     "50075");
-    DEFAULT_JMX_PORTS.put("JOBTRACKER",   "50030");
-    DEFAULT_JMX_PORTS.put("TASKTRACKER",  "50060");
-    DEFAULT_JMX_PORTS.put("HBASE_MASTER", "60010");
+    DEFAULT_JMX_PORTS.put("NAMENODE",           "50070");
+    DEFAULT_JMX_PORTS.put("DATANODE",           "50075");
+    DEFAULT_JMX_PORTS.put("JOBTRACKER",         "50030");
+    DEFAULT_JMX_PORTS.put("TASKTRACKER",        "50060");
+    DEFAULT_JMX_PORTS.put("HBASE_MASTER",       "60010");
+    DEFAULT_JMX_PORTS.put("HBASE_REGIONSERVER", "60030");
 
     ObjectMapper objectMapper = new ObjectMapper();
     objectMapper.configure(DeserializationConfig.Feature.USE_ANNOTATIONS, false);

ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostComponentProviderTest.java

@@ -54,6 +54,32 @@ public class GSInstallerHostComponentProviderTest {
     Assert.assertTrue(resources.isEmpty());
   }
 
+  @Test
+  public void testGetResourcesCheckState() throws Exception {
+    TestGSInstallerStateProvider stateProvider = new TestGSInstallerStateProvider();
+    ClusterDefinition clusterDefinition = new ClusterDefinition(stateProvider, 500);
+    GSInstallerResourceProvider provider = new GSInstallerHostComponentProvider(clusterDefinition);
+    Predicate predicate = new PredicateBuilder().property(GSInstallerHostComponentProvider.HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID).equals("HBASE_REGIONSERVER").toPredicate();
+    Set<Resource> resources = provider.getResources(PropertyHelper.getReadRequest(), predicate);
+    Assert.assertEquals(3, resources.size());
+
+    for (Resource resource : resources) {
+      Assert.assertEquals("STARTED", resource.getPropertyValue(GSInstallerHostComponentProvider.HOST_COMPONENT_STATE_PROPERTY_ID));
+    }
+
+    stateProvider.setHealthy(false);
+
+    // need to wait for old state value to expire
+    Thread.sleep(501);
+
+    resources = provider.getResources(PropertyHelper.getReadRequest(), predicate);
+    Assert.assertEquals(3, resources.size());
+
+    for (Resource resource : resources) {
+      Assert.assertEquals("INIT", resource.getPropertyValue(GSInstallerHostComponentProvider.HOST_COMPONENT_STATE_PROPERTY_ID));
+    }
+  }
+
   @Test
   public void testCreateResources() throws Exception {
     ClusterDefinition clusterDefinition = new ClusterDefinition(new TestGSInstallerStateProvider());

ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostProviderTest.java

@@ -62,7 +62,7 @@ public class GSInstallerHostProviderTest {
   @Test
   public void testGetResourcesCheckState() throws Exception {
     TestGSInstallerStateProvider stateProvider = new TestGSInstallerStateProvider();
-    ClusterDefinition clusterDefinition = new ClusterDefinition(stateProvider);
+    ClusterDefinition clusterDefinition = new ClusterDefinition(stateProvider, 500);
     GSInstallerResourceProvider provider = new GSInstallerHostProvider(clusterDefinition);
     Predicate predicate = new PredicateBuilder().property(GSInstallerHostProvider.HOST_NAME_PROPERTY_ID).equals("ip-10-190-97-104.ec2.internal").toPredicate();
     Set<Resource> resources = provider.getResources(PropertyHelper.getReadRequest(), predicate);
@@ -75,7 +75,7 @@ public class GSInstallerHostProviderTest {
     stateProvider.setHealthy(false);
 
     // need to wait for old state value to expire
-    Thread.sleep(15001);
+    Thread.sleep(501);
 
     resources = provider.getResources(PropertyHelper.getReadRequest(), predicate);
     Assert.assertEquals(1, resources.size());

ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerServiceProviderTest.java

@@ -62,7 +62,7 @@ public class GSInstallerServiceProviderTest {
   @Test
   public void testGetResourcesCheckState() throws Exception {
     TestGSInstallerStateProvider stateProvider = new TestGSInstallerStateProvider();
-    ClusterDefinition clusterDefinition = new ClusterDefinition(stateProvider);
+    ClusterDefinition clusterDefinition = new ClusterDefinition(stateProvider, 500);
     GSInstallerResourceProvider provider = new GSInstallerServiceProvider(clusterDefinition);
     Predicate predicate = new PredicateBuilder().property(GSInstallerServiceProvider.SERVICE_SERVICE_NAME_PROPERTY_ID).equals("MAPREDUCE").toPredicate();
     Set<Resource> resources = provider.getResources(PropertyHelper.getReadRequest(), predicate);
@@ -75,7 +75,7 @@ public class GSInstallerServiceProviderTest {
     stateProvider.setHealthy(false);
 
     // need to wait for old state value to expire
-    Thread.sleep(15001);
+    Thread.sleep(501);
 
     resources = provider.getResources(PropertyHelper.getReadRequest(), predicate);
     Assert.assertEquals(1, resources.size());