[ambari] branch trunk updated: [AMBARI-24022] AutoStart Is not working for some of the components in the cluster (aonishuk) (#1472)

[sw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

swagle pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new f7d398f  [AMBARI-24022] AutoStart Is not working for some of the components in the cluster  (aonishuk) (#1472)
f7d398f is described below

commit f7d398f594535ad6e90af93610f94f40eb205a1c
Author: aonishuk <ao...@hortonworks.com>
AuthorDate: Wed Jun 6 00:30:45 2018 +0300

    [AMBARI-24022] AutoStart Is not working for some of the components in the cluster  (aonishuk) (#1472)
---
 .../AmbariCustomCommandExecutionHelper.java        | 29 ----------------------
 .../controller/AmbariManagementControllerImpl.java | 12 ---------
 2 files changed, 41 deletions(-)

diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
index 4c69991..30db434 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
@@ -758,19 +758,6 @@ public class AmbariCustomCommandExecutionHelper {
     }
 
     Map<String, String> commandParams = new TreeMap<>();
-
-    //Propagate HCFS service type info
-    Map<String, ServiceInfo> serviceInfos = ambariMetaInfo.getServices(stackId.getStackName(), stackId.getStackVersion());
-    for (ServiceInfo serviceInfoInstance : serviceInfos.values()) {
-      if (serviceInfoInstance.getServiceType() != null) {
-        LOG.debug("Adding {} to command parameters for {}", serviceInfoInstance.getServiceType(),
-            serviceInfoInstance.getName());
-
-        commandParams.put("dfs_type", serviceInfoInstance.getServiceType());
-        break;
-      }
-    }
-
     String commandTimeout = getStatusCommandTimeout(serviceInfo);
 
     if (serviceInfo.getSchemaVersion().equals(AmbariMetaInfo.SCHEMA_VERSION_2)) {
@@ -1260,22 +1247,6 @@ public class AmbariCustomCommandExecutionHelper {
       if (null == stackId && null != cluster) {
         stackId = cluster.getDesiredStackVersion();
       }
-
-      //Propogate HCFS service type info to command params
-      if (null != stackId) {
-        Map<String, ServiceInfo> serviceInfos = ambariMetaInfo.getServices(stackId.getStackName(),
-            stackId.getStackVersion());
-
-        for (ServiceInfo serviceInfoInstance : serviceInfos.values()) {
-          if (serviceInfoInstance.getServiceType() != null) {
-            LOG.debug("Adding {} to command parameters for {}",
-                serviceInfoInstance.getServiceType(), serviceInfoInstance.getName());
-
-            commandParamsStage.put("dfs_type", serviceInfoInstance.getServiceType());
-            break;
-          }
-        }
-      }
     }
 
     String hostParamsStageJson = StageUtils.getGson().toJson(hostParamsStage);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 5a738e1..ef63ad4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -2422,18 +2422,6 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
       commandParams.putAll(commandParamsInp);
     }
 
-    // Propagate HCFS service type info
-    for (Service service : cluster.getServices().values()) {
-      ServiceInfo serviceInfoInstance = servicesMap.get(service.getName());
-      LOG.debug("Iterating service type Instance in createHostAction: {}", serviceInfoInstance.getName());
-      String serviceType = serviceInfoInstance.getServiceType();
-      if (serviceType != null) {
-        LOG.info("Adding service type info in createHostAction: {}", serviceType);
-        commandParams.put("dfs_type", serviceType);
-        break;
-      }
-    }
-
     boolean isInstallCommand = roleCommand.equals(RoleCommand.INSTALL);
     String agentDefaultCommandTimeout = configs.getDefaultAgentTaskTimeout(isInstallCommand);
     String scriptCommandTimeout = "";

-- 
To stop receiving notification emails like this one, please contact
swagle@apache.org.