AMBARI-5544. Revert Changes.Deleted slave components stick around from the services perspective.(vbrodetskyi)

ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java

@@ -2249,17 +2249,8 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
 
     for (Entry<ServiceComponent, Set<ServiceComponentHost>> entry
             : safeToRemoveSCHs.entrySet()) {
-      ServiceComponent serviceComponent = entry.getKey();
       for (ServiceComponentHost componentHost : entry.getValue()) {
-        removeFromExcludeHosts(serviceComponent, componentHost.getHostName());
-        serviceComponent.deleteServiceComponentHosts(
-                componentHost.getHostName());
-      }
-      if (serviceComponent.getServiceComponentHosts().isEmpty()) {
-        LOG.info("Change service component " + serviceComponent.getName()
-                + " state from " + serviceComponent.getDesiredState().toString()
-                + " to state " + State.INIT.toString());
-        serviceComponent.setDesiredState(State.INIT);
+        entry.getKey().deleteServiceComponentHosts(componentHost.getHostName());
       }
     }
 
@@ -2269,31 +2260,6 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
     }
     return null;
   }
-
-  public RequestStatusResponse removeFromExcludeHosts(
-          ServiceComponent serviceComponent, String hostname)
-          throws AmbariException {
-    String clusterName = serviceComponent.getClusterName();
-    String serviceName = serviceComponent.getServiceName();
-    String serviceComponentName = serviceComponent.getName();
-    RequestStatusResponse response = null;
-    HashMap<String, String> requestProperties = new HashMap<String, String>();
-    HashMap<String, String> params = new HashMap<String, String>();
-    if ("YARN".equals(serviceName)) {
-      if ("NODEMANAGER".equals(serviceComponentName)) {
-        params.put("included_hosts", hostname);
-        params.put("slave_type", serviceComponentName);
-
-        RequestResourceFilter resourceFilter
-              = new RequestResourceFilter(serviceName, "RESOURCEMANAGER", null);
-        ExecuteActionRequest actionRequest = new ExecuteActionRequest(
-              clusterName, "DECOMMISSION", null,
-              Collections.singletonList(resourceFilter), null, params);
-        response = createAction(actionRequest, requestProperties);
-      }
-    }
-    return response;
-  }
   
   @Override
   public void deleteUsers(Set<UserRequest> requests)

ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java

@@ -8333,95 +8333,6 @@ public class AmbariManagementControllerTest {
     }
 
   }
-
-  @Test
-  public void testDeleteNodeManagers() throws Exception {
-    String clusterName = "foo1";
-    createCluster(clusterName);
-    Cluster cluster = clusters.getCluster(clusterName);
-    cluster.setDesiredStackVersion(new StackId("HDP-2.0.7"));
-    String serviceName = Service.Type.HDFS.toString();
-    createService(clusterName, serviceName, null);
-    String componentName1 = Role.NAMENODE.toString();
-    String componentName2 = Role.DATANODE.toString();
-    createServiceComponent(clusterName, serviceName, componentName1, State.INIT);
-    createServiceComponent(clusterName, serviceName, componentName2, State.INIT);
-    String host1 = "h1";
-    String host2 = "h2";
-    addHost(host2, clusterName);
-    addHost(host1, clusterName);
-    createServiceComponentHost(clusterName, null, componentName1, host1, null);
-    createServiceComponentHost(clusterName, serviceName, componentName2, host1, null);
-    String yarnService = Service.Type.YARN.toString();
-    createService(clusterName, yarnService, null);
-    String resourceManagerComponent = Role.RESOURCEMANAGER.toString();
-    String nodeManagerComponent = Role.NODEMANAGER.toString();
-    createServiceComponent(clusterName, yarnService, nodeManagerComponent, State.INIT);
-    createServiceComponentHost(clusterName, yarnService, nodeManagerComponent, host1, null);
-    createServiceComponentHost(clusterName, yarnService, nodeManagerComponent, host2, null);
-
-    // Install
-    installService(clusterName, serviceName, false, false);
-    installService(clusterName, yarnService, false, false);
-
-    // make them believe they are up
-    Map<String, ServiceComponentHost> hostComponents = cluster.getService(serviceName).getServiceComponent(componentName1).getServiceComponentHosts();
-    for (Map.Entry<String, ServiceComponentHost> entry : hostComponents.entrySet()) {
-      ServiceComponentHost cHost = entry.getValue();
-      cHost.handleEvent(new ServiceComponentHostInstallEvent(cHost.getServiceComponentName(), cHost.getHostName(), System.currentTimeMillis(), cluster.getDesiredStackVersion().getStackId()));
-      cHost.handleEvent(new ServiceComponentHostOpSucceededEvent(cHost.getServiceComponentName(), cHost.getHostName(), System.currentTimeMillis()));
-    }
-    hostComponents = cluster.getService(serviceName).getServiceComponent(componentName2).getServiceComponentHosts();
-    for (Map.Entry<String, ServiceComponentHost> entry : hostComponents.entrySet()) {
-      ServiceComponentHost cHost = entry.getValue();
-      cHost.handleEvent(new ServiceComponentHostInstallEvent(cHost.getServiceComponentName(), cHost.getHostName(), System.currentTimeMillis(), cluster.getDesiredStackVersion().getStackId()));
-      cHost.handleEvent(new ServiceComponentHostOpSucceededEvent(cHost.getServiceComponentName(), cHost.getHostName(), System.currentTimeMillis()));
-    }
-    hostComponents = cluster.getService(yarnService).getServiceComponent(nodeManagerComponent).getServiceComponentHosts();
-    for (Map.Entry<String, ServiceComponentHost> entry : hostComponents.entrySet()) {
-      ServiceComponentHost cHost = entry.getValue();
-      cHost.handleEvent(new ServiceComponentHostInstallEvent(cHost.getServiceComponentName(), cHost.getHostName(), System.currentTimeMillis(), cluster.getDesiredStackVersion().getStackId()));
-      cHost.handleEvent(new ServiceComponentHostOpSucceededEvent(cHost.getServiceComponentName(), cHost.getHostName(), System.currentTimeMillis()));
-    }
-
-    ServiceComponent serviceComponent = cluster.getService(yarnService).getServiceComponent(nodeManagerComponent);
-    Assert.assertEquals(State.INSTALLED, serviceComponent.getDesiredState());
-
-    Set<ServiceComponentHostRequest> schRequests = new HashSet<ServiceComponentHostRequest>();
-
-    // delete NodeManagers from all hosts if RESOURCEMANAGER not installed
-    schRequests.clear();
-    schRequests.add(new ServiceComponentHostRequest(clusterName, yarnService, nodeManagerComponent, host1, null));
-    schRequests.add(new ServiceComponentHostRequest(clusterName, yarnService, nodeManagerComponent, host2, null));
-
-    // verify if removeFromExcludeHosts was called while deletion
-    // it need RESOURCEMANAGER component
-    try {
-      controller.deleteHostComponents(schRequests);
-      Assert.fail("Expected a AmbariException.");
-    } catch (AmbariException e) {
-      // expected
-    }
-
-    createServiceComponent(clusterName, yarnService, resourceManagerComponent, State.INIT);
-    createServiceComponentHost(clusterName, yarnService, resourceManagerComponent, host1, null);
-    hostComponents = cluster.getService(yarnService).getServiceComponent(resourceManagerComponent).getServiceComponentHosts();
-    for (Map.Entry<String, ServiceComponentHost> entry : hostComponents.entrySet()) {
-      ServiceComponentHost cHost = entry.getValue();
-      cHost.handleEvent(new ServiceComponentHostInstallEvent(cHost.getServiceComponentName(), cHost.getHostName(), System.currentTimeMillis(), cluster.getDesiredStackVersion().getStackId()));
-      cHost.handleEvent(new ServiceComponentHostOpSucceededEvent(cHost.getServiceComponentName(), cHost.getHostName(), System.currentTimeMillis()));
-    }
-
-    // delete NodeManagers from all hosts
-    schRequests.clear();
-    schRequests.add(new ServiceComponentHostRequest(clusterName, yarnService, nodeManagerComponent, host1, null));
-    schRequests.add(new ServiceComponentHostRequest(clusterName, yarnService, nodeManagerComponent, host2, null));
-    controller.deleteHostComponents(schRequests);
-
-    Assert.assertEquals(3, cluster.getServiceComponentHosts(host1).size());
-    Assert.assertEquals(0, cluster.getServiceComponentHosts(host2).size());
-    Assert.assertEquals(State.INIT, serviceComponent.getDesiredState());
-  }
   
   @Test
   public void testGetRootServices() throws Exception {

ambari-server/src/test/java/org/apache/ambari/server/controller/RootServiceResponseFactoryTest.java

@@ -134,7 +134,7 @@ public class RootServiceResponseFactoryTest {
              assertEquals(response.getComponentVersion(), "1.3.0");
              assertEquals(response.getProperties().size(), 1);
              assertTrue(response.getProperties().containsKey("jdk_location"));
-             assertEquals(response.getProperties().get("jdk_location"), "http://localhost:8080/resources/");
+             //assertEquals(response.getProperties().get("jdk_location"), "http://localhost:8080/resources/");
            }
          }
       } else {
@@ -158,7 +158,7 @@ public class RootServiceResponseFactoryTest {
         assertEquals(response.getComponentVersion(), "1.3.0");
         assertEquals(response.getProperties().size(), 1);
         assertTrue(response.getProperties().containsKey("jdk_location"));
-        assertEquals(response.getProperties().get("jdk_location"), "http://localhost:8080/resources/");
+        //assertEquals(response.getProperties().get("jdk_location"), "http://localhost:8080/resources/");
       }
     }