AMBARI-5256 - Missing host components in Ambari SCOM Server API

contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/msi/ClusterDefinition.java

@@ -61,6 +61,32 @@ public class ClusterDefinition {
   private int nextRequestId = 1;
   private int nextTaskId = 1;
 
+  /**
+   * Client only components
+   */
+  private final Set<String> clientOnlyComponents = new HashSet<String>(){{
+    add("PIG");
+    add("SQOOP");
+    add("YARN_CLIENT");
+    add("MAPREDUCE2_CLIENT");
+  }};
+
+  private Boolean isClientOnlyComponent(String componentName) {
+    return clientOnlyComponents.contains(componentName);
+  }
+
+  /**
+   * Client only services
+   */
+  private final Set<String> clientOnlyServices = new HashSet<String>(){{
+    add("PIG");
+    add("SQOOP");
+  }};
+
+  private Boolean isClientOnlyService(String serviceName) {
+    return clientOnlyServices.contains(serviceName);
+  }
+
   /**
    * Component name mapping to account for differences in what is provided by the MSI
    * and what is expected by the Ambari providers.
@@ -109,6 +135,10 @@ public class ClusterDefinition {
         //hiveComponents.add("MYSQL_SERVER");
 
         Set<String> clientHosts = new HashSet<String>();
+        clientHosts.add("PIG");
+        clientHosts.add("SQOOP");
+        clientHosts.add("YARN_CLIENT");
+        clientHosts.add("MAPREDUCE2_CLIENT");
         componentNameMap.put("CLIENT_HOSTS", clientHosts);
       }
     }
@@ -141,10 +171,14 @@ public class ClusterDefinition {
         componentServiceMap.put("TASKTRACKER",        "MAPREDUCE");
       }
       if(majorStackVersion == 2) {
+        componentServiceMap.put("PIG",                "PIG");
+        componentServiceMap.put("SQOOP",              "SQOOP");
         componentServiceMap.put("HISTORYSERVER",      "MAPREDUCE2");
+        componentServiceMap.put("MAPREDUCE2_CLIENT",  "MAPREDUCE2");
         componentServiceMap.put("JOURNALNODE",        "HDFS");
         componentServiceMap.put("NODEMANAGER",        "YARN");
         componentServiceMap.put("RESOURCEMANAGER",    "YARN");
+        componentServiceMap.put("YARN_CLIENT",        "YARN");
         //componentServiceMap.put("MYSQL_SERVER",       "HIVE");
       }
     }
@@ -307,6 +341,7 @@ public class ClusterDefinition {
         Set<String> componentNames = entry.getValue();
 
         for (String componentName : componentNames) {
+          if (isClientOnlyComponent(componentName)) continue;
           if (stateProvider.getRunningState(hostName, componentName) != StateProvider.State.Running) {
             return "INSTALLED";
           }
@@ -329,19 +364,21 @@ public class ClusterDefinition {
         state.equals("INSTALLED") ? StateProvider.State.Stopped : StateProvider.State.Unknown;
 
     int requestId = -1;
-    // if the state is already set to the desired state or state is unknown then skip it
-    if (s != StateProvider.State.Unknown && !state.equals(getServiceState(serviceName))) {
-      Map<String, Set<String>> serviceHostComponents = hostComponents.get(serviceName);
-      if (serviceHostComponents != null) {
+    if (!isClientOnlyService(serviceName)) {
+      // if the state is already set to the desired state or state is unknown then skip it
+      if (s != StateProvider.State.Unknown && !state.equals(getServiceState(serviceName))) {
+        Map<String, Set<String>> serviceHostComponents = hostComponents.get(serviceName);
+        if (serviceHostComponents != null) {
 
-        for (Map.Entry<String, Set<String>> entry : serviceHostComponents.entrySet()) {
-          String      hostName       = entry.getKey();
-          Set<String> componentNames = entry.getValue();
+          for (Map.Entry<String, Set<String>> entry : serviceHostComponents.entrySet()) {
+            String      hostName       = entry.getKey();
+            Set<String> componentNames = entry.getValue();
 
-          for (String componentName : componentNames) {
-            if(state.equals(getHostComponentState(hostName, componentName))) continue;
-            requestId = recordProcess(stateProvider.setRunningState(hostName, componentName, s), requestId,
-                "Set service " + serviceName + " state to " + s);
+            for (String componentName : componentNames) {
+              if(state.equals(getHostComponentState(hostName, componentName))) continue;
+              requestId = recordProcess(stateProvider.setRunningState(hostName, componentName, s), requestId,
+                      "Set service " + serviceName + " state to " + s);
+            }
           }
         }
       }
@@ -367,6 +404,7 @@ public class ClusterDefinition {
 
         for (String name : componentNames) {
           if (name.equals(componentName)) {
+            if (isClientOnlyComponent(componentName)) return "INSTALLED";
             if (stateProvider.getRunningState(hostName, componentName) != StateProvider.State.Running) {
               return "INSTALLED";
             }
@@ -392,20 +430,21 @@ public class ClusterDefinition {
         state.equals("INSTALLED") ? StateProvider.State.Stopped : StateProvider.State.Unknown;
 
     int requestId = -1;
-
-    if (s != StateProvider.State.Unknown) {
-      Map<String, Set<String>> serviceHostComponents = hostComponents.get(serviceName);
-      if (serviceHostComponents != null) {
-
-        for (Map.Entry<String, Set<String>> entry : serviceHostComponents.entrySet()) {
-          String      hostName       = entry.getKey();
-          Set<String> componentNames = entry.getValue();
-
-          for (String name : componentNames) {
-            if (name.equals(componentName)) {
-              if(state.equals(getHostComponentState(hostName, componentName))) continue;
-              requestId = recordProcess(stateProvider.setRunningState(hostName, componentName, s), requestId,
-                  "Set component " + componentName + " state to " + s);
+    if (!isClientOnlyComponent(componentName)) {
+      if (s != StateProvider.State.Unknown) {
+        Map<String, Set<String>> serviceHostComponents = hostComponents.get(serviceName);
+        if (serviceHostComponents != null) {
+
+          for (Map.Entry<String, Set<String>> entry : serviceHostComponents.entrySet()) {
+            String      hostName       = entry.getKey();
+            Set<String> componentNames = entry.getValue();
+
+            for (String name : componentNames) {
+              if (name.equals(componentName)) {
+                if(state.equals(getHostComponentState(hostName, componentName))) continue;
+                requestId = recordProcess(stateProvider.setRunningState(hostName, componentName, s), requestId,
+                        "Set component " + componentName + " state to " + s);
+              }
             }
           }
         }
@@ -423,8 +462,9 @@ public class ClusterDefinition {
     * @return the host component state
     */
   public String getHostComponentState(String hostName, String componentName) {
-
-    boolean healthy = stateProvider.getRunningState(hostName, componentName) == StateProvider.State.Running;
+    Boolean healthy = Boolean.FALSE;
+    if (!isClientOnlyComponent(componentName))
+      healthy = stateProvider.getRunningState(hostName, componentName) == StateProvider.State.Running;
     return healthy ? "STARTED" : "INSTALLED";
   }
 
@@ -441,10 +481,11 @@ public class ClusterDefinition {
         state.equals("INSTALLED") ? StateProvider.State.Stopped : StateProvider.State.Unknown;
 
     int requestId = -1;
-
-    if (s != StateProvider.State.Unknown && !state.equals(getHostComponentState(hostName, componentName))) {
-      requestId = recordProcess(stateProvider.setRunningState(hostName, componentName, s), -1,
-          "Set host component " + componentName + " state to " + s);
+    if (!isClientOnlyComponent(componentName)) {
+      if (s != StateProvider.State.Unknown && !state.equals(getHostComponentState(hostName, componentName))) {
+        requestId = recordProcess(stateProvider.setRunningState(hostName, componentName, s), -1,
+                "Set host component " + componentName + " state to " + s);
+      }
     }
     return requestId;
   }

contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/msi/ClusterDefinitionTest.java

@@ -300,10 +300,54 @@ public class ClusterDefinitionTest {
 
     ClusterDefinition clusterDefinition = new ClusterDefinition(mockStateProvider, mockClusterDefinitionProvider, mockHostInfoProvider);
     Assert.assertFalse(clusterDefinition.getServices().contains("MAPREDUCE"));
+    Assert.assertTrue(clusterDefinition.getServices().contains("PIG"));
+    Assert.assertTrue(clusterDefinition.getServices().contains("SQOOP"));
     Assert.assertTrue(clusterDefinition.getServices().contains("YARN"));
     Assert.assertTrue(clusterDefinition.getServices().contains("MAPREDUCE2"));
+    Assert.assertTrue(clusterDefinition.getComponents("MAPREDUCE2").contains("MAPREDUCE2_CLIENT"));
     Assert.assertTrue(clusterDefinition.getComponents("YARN").contains("NODEMANAGER"));
     Assert.assertTrue(clusterDefinition.getComponents("YARN").contains("RESOURCEMANAGER"));
+    Assert.assertTrue(clusterDefinition.getComponents("YARN").contains("YARN_CLIENT"));
+
+    verify(mockClusterDefinitionProvider, mockHostInfoProvider, mockStateProvider);
+  }
+
+  @Test
+  public void testSetServiceState_IfServiceIsClientOnly() {
+    StateProvider mockStateProvider = createStrictMock(StateProvider.class);
+    ClusterDefinitionProvider mockClusterDefinitionProvider = createStrictMock(ClusterDefinitionProvider.class);
+    HostInfoProvider mockHostInfoProvider = createStrictMock(HostInfoProvider.class);
+
+    TestClusterDefinitionProvider testClusterDefinitionProvider = new TestClusterDefinitionProvider();
+
+    expect(mockClusterDefinitionProvider.getClusterName()).andDelegateTo(testClusterDefinitionProvider);
+    expect(mockClusterDefinitionProvider.getVersionId()).andDelegateTo(testClusterDefinitionProvider);
+    expect(mockClusterDefinitionProvider.getInputStream()).andDelegateTo(testClusterDefinitionProvider);
+
+    replay(mockClusterDefinitionProvider, mockHostInfoProvider, mockStateProvider);
+
+    ClusterDefinition clusterDefinition = new ClusterDefinition(mockStateProvider, mockClusterDefinitionProvider, mockHostInfoProvider);
+    Assert.assertEquals(-1, clusterDefinition.setServiceState("PIG", "STARTED"));
+
+    verify(mockClusterDefinitionProvider, mockHostInfoProvider, mockStateProvider);
+  }
+
+  @Test
+  public void testSetHostComponentState_IfHostComponentIsClientOnly() {
+    StateProvider mockStateProvider = createStrictMock(StateProvider.class);
+    ClusterDefinitionProvider mockClusterDefinitionProvider = createStrictMock(ClusterDefinitionProvider.class);
+    HostInfoProvider mockHostInfoProvider = createStrictMock(HostInfoProvider.class);
+
+    TestClusterDefinitionProvider testClusterDefinitionProvider = new TestClusterDefinitionProvider();
+
+    expect(mockClusterDefinitionProvider.getClusterName()).andDelegateTo(testClusterDefinitionProvider);
+    expect(mockClusterDefinitionProvider.getVersionId()).andDelegateTo(testClusterDefinitionProvider);
+    expect(mockClusterDefinitionProvider.getInputStream()).andDelegateTo(testClusterDefinitionProvider);
+
+    replay(mockClusterDefinitionProvider, mockHostInfoProvider, mockStateProvider);
+
+    ClusterDefinition clusterDefinition = new ClusterDefinition(mockStateProvider, mockClusterDefinitionProvider, mockHostInfoProvider);
+    Assert.assertEquals(-1, clusterDefinition.setHostComponentState("hostName", "SQOOP", "STARTED"));
 
     verify(mockClusterDefinitionProvider, mockHostInfoProvider, mockStateProvider);
   }