You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mp...@apache.org on 2018/03/19 22:21:27 UTC

[ambari] branch trunk updated: AMBARI-23266. Wrong service_package_folder in serviceLevelParams during Express Upgrade from HDP 2.6 to HDP 3.0. (mpapirkovskyy)

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

mpapirkovskyy 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 5764498  AMBARI-23266. Wrong service_package_folder in serviceLevelParams during Express Upgrade from HDP 2.6 to HDP 3.0. (mpapirkovskyy)
5764498 is described below

commit 576449879d7f39c267eb80edf4a3644d4bbfcc1e
Author: Myroslav Papirkovskyi <mp...@apache.org>
AuthorDate: Fri Mar 16 18:24:32 2018 +0200

    AMBARI-23266. Wrong service_package_folder in serviceLevelParams during Express Upgrade from HDP 2.6 to HDP 3.0. (mpapirkovskyy)
---
 .../python/ambari_agent/ClusterTopologyCache.py    |  12 +-
 .../src/main/python/ambari_agent/FileCache.py      |   5 +-
 .../actionmanager/ExecutionCommandWrapper.java     |  11 --
 .../server/agent/stomp/HostLevelParamsHolder.java  |  25 +++
 .../ambari/server/agent/stomp/MetadataHolder.java  |  14 ++
 .../ambari/server/agent/stomp/TopologyHolder.java  |  53 +++++-
 .../server/agent/stomp/dto/TopologyComponent.java  |  10 +-
 .../controller/AmbariManagementControllerImpl.java | 203 +++++++++++++--------
 .../controller/internal/HostResourceProvider.java  |   5 +-
 .../internal/UpgradeResourceProvider.java          |   1 +
 .../apache/ambari/server/events/AmbariEvent.java   |   7 +-
 .../events/ClusterComponentsRepoChangedEvent.java  |  25 +++
 .../upgrades/UpdateDesiredRepositoryAction.java    |   4 +-
 .../apache/ambari/server/state/UpgradeHelper.java  |  10 +
 .../AMBARI_METRICS/0.1.0/package/scripts/params.py |   2 +-
 .../custom_actions/scripts/ru_execute_tasks.py     |   4 +-
 .../stack-hooks/after-INSTALL/scripts/params.py    |   2 +-
 .../ambari/server/agent/TestHeartbeatMonitor.java  |   2 -
 18 files changed, 287 insertions(+), 108 deletions(-)

diff --git a/ambari-agent/src/main/python/ambari_agent/ClusterTopologyCache.py b/ambari-agent/src/main/python/ambari_agent/ClusterTopologyCache.py
index a0882d3..f23c7f7 100644
--- a/ambari-agent/src/main/python/ambari_agent/ClusterTopologyCache.py
+++ b/ambari-agent/src/main/python/ambari_agent/ClusterTopologyCache.py
@@ -80,8 +80,9 @@ class ClusterTopologyCache(ClusterCache):
 
       current_host_id = self.current_host_ids_to_cluster[cluster_id]
       for component_dict in self[cluster_id].components:
-        if current_host_id in component_dict.hostIds:
-          self.cluster_local_components[cluster_id].append(component_dict.componentName)
+        if 'hostIds' in component_dict and current_host_id in component_dict.hostIds:
+          if current_host_id in component_dict.hostIds:
+            self.cluster_local_components[cluster_id].append(component_dict.componentName)
 
 
     self.hosts_to_id = ImmutableDictionary(hosts_to_id)
@@ -188,8 +189,11 @@ class ClusterTopologyCache(ClusterCache):
         for component_updates_dict in cluster_updates_dict['components']:
           component_mutable_dict = ClusterTopologyCache._find_component_in_dict(components_mutable_list, component_updates_dict['serviceName'], component_updates_dict['componentName'])
           if component_mutable_dict is not None:
-            component_updates_dict['hostIds'] += component_mutable_dict['hostIds']
-            component_updates_dict['hostIds'] = list(set(component_updates_dict['hostIds']))
+            if 'hostIds' in component_updates_dict:
+              if not 'hostIds' in component_mutable_dict:
+                component_mutable_dict['hostIds'] = []
+              component_updates_dict['hostIds'] += component_mutable_dict['hostIds']
+              component_updates_dict['hostIds'] = list(set(component_updates_dict['hostIds']))
             component_mutable_dict.update(component_updates_dict)
           else:
             components_mutable_list.append(component_updates_dict)
diff --git a/ambari-agent/src/main/python/ambari_agent/FileCache.py b/ambari-agent/src/main/python/ambari_agent/FileCache.py
index 1df4926..cbc0755 100644
--- a/ambari-agent/src/main/python/ambari_agent/FileCache.py
+++ b/ambari-agent/src/main/python/ambari_agent/FileCache.py
@@ -74,7 +74,10 @@ class FileCache():
     """
     Returns a base directory for service
     """
-    service_subpath = command['serviceLevelParams']['service_package_folder']
+    if 'service_package_folder' in command['commandParams']:
+      service_subpath = command['commandParams']['service_package_folder']
+    else:
+      service_subpath = command['serviceLevelParams']['service_package_folder']
     return self.provide_directory(self.cache_dir, service_subpath,
                                   server_url_prefix)
 
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
index 7b3ee73..e168509 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
@@ -18,7 +18,6 @@
 package org.apache.ambari.server.actionmanager;
 
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.HOOKS_FOLDER;
-import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SERVICE_PACKAGE_FOLDER;
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.VERSION;
 
 import java.util.Map;
@@ -45,7 +44,6 @@ import org.apache.ambari.server.state.DesiredConfig;
 import org.apache.ambari.server.state.Host;
 import org.apache.ambari.server.state.Service;
 import org.apache.ambari.server.state.ServiceComponent;
-import org.apache.ambari.server.state.ServiceInfo;
 import org.apache.ambari.server.state.StackId;
 import org.apache.ambari.server.state.StackInfo;
 import org.apache.ambari.server.state.UpgradeContext;
@@ -275,15 +273,6 @@ public class ExecutionCommandWrapper {
         if (!commandParams.containsKey(HOOKS_FOLDER)) {
           commandParams.put(HOOKS_FOLDER,configuration.getProperty(Configuration.HOOKS_FOLDER));
         }
-
-        if (!commandParams.containsKey(SERVICE_PACKAGE_FOLDER)) {
-          if (!StringUtils.isEmpty(serviceName)) {
-            ServiceInfo serviceInfo = ambariMetaInfo.getService(stackId.getStackName(),
-              stackId.getStackVersion(), serviceName);
-
-            commandParams.put(SERVICE_PACKAGE_FOLDER, serviceInfo.getServicePackageFolder());
-          }
-        }
       }
 
       // set the desired versions of versionable components.  This is safe even during an upgrade because
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/HostLevelParamsHolder.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/HostLevelParamsHolder.java
index d2d8898..b2c1b22 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/HostLevelParamsHolder.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/HostLevelParamsHolder.java
@@ -17,17 +17,21 @@
  */
 package org.apache.ambari.server.agent.stomp;
 
+import java.util.Collection;
 import java.util.TreeMap;
 
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.agent.RecoveryConfigHelper;
 import org.apache.ambari.server.agent.stomp.dto.HostLevelParamsCluster;
 import org.apache.ambari.server.controller.AmbariManagementController;
+import org.apache.ambari.server.events.ClusterComponentsRepoChangedEvent;
 import org.apache.ambari.server.events.HostLevelParamsUpdateEvent;
+import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
 import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.Host;
 
+import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.google.inject.Singleton;
@@ -44,6 +48,11 @@ public class HostLevelParamsHolder extends AgentHostDataHolder<HostLevelParamsUp
   @Inject
   private Provider<AmbariManagementController> m_ambariManagementController;
 
+  @Inject
+  public HostLevelParamsHolder(AmbariEventPublisher ambariEventPublisher) {
+    ambariEventPublisher.register(this);
+  }
+
   @Override
   public HostLevelParamsUpdateEvent getCurrentData(Long hostId) throws AmbariException {
     TreeMap<String, HostLevelParamsCluster> hostLevelParamsClusters = new TreeMap<>();
@@ -71,4 +80,20 @@ public class HostLevelParamsHolder extends AgentHostDataHolder<HostLevelParamsUp
   protected HostLevelParamsUpdateEvent getEmptyData() {
     return HostLevelParamsUpdateEvent.emptyUpdate();
   }
+
+  @Subscribe
+  public void onClusterComponentsRepoUpdate(ClusterComponentsRepoChangedEvent clusterComponentsRepoChangedEvent) throws AmbariException {
+    Long clusterId = clusterComponentsRepoChangedEvent.getClusterId();
+
+    Cluster cluster = clusters.getCluster(clusterId);
+    Collection<Host> hosts = clusters.getCluster(clusterId).getHosts();
+    for (Host host : hosts) {
+      HostLevelParamsUpdateEvent hostLevelParamsUpdateEvent = new HostLevelParamsUpdateEvent(Long.toString(clusterId),
+          new HostLevelParamsCluster(
+            m_ambariManagementController.get().retrieveHostRepositories(cluster, host),
+            recoveryConfigHelper.getRecoveryConfig(cluster.getClusterName(), host.getHostName())));
+      hostLevelParamsUpdateEvent.setHostId(host.getHostId());
+      updateData(hostLevelParamsUpdateEvent);
+    }
+  }
 }
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/MetadataHolder.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/MetadataHolder.java
index 7a0a040..11aa512 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/MetadataHolder.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/MetadataHolder.java
@@ -22,8 +22,10 @@ import java.util.Map;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.agent.stomp.dto.MetadataCluster;
 import org.apache.ambari.server.controller.AmbariManagementControllerImpl;
+import org.apache.ambari.server.events.ClusterComponentsRepoChangedEvent;
 import org.apache.ambari.server.events.ClusterConfigChangedEvent;
 import org.apache.ambari.server.events.MetadataUpdateEvent;
+import org.apache.ambari.server.events.ServiceInstalledEvent;
 import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
 import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
@@ -86,4 +88,16 @@ public class MetadataHolder extends AgentClusterDataHolder<MetadataUpdateEvent>
     updateData(ambariManagementController.getClusterMetadataOnConfigsUpdate(cluster));
 
   }
+
+  @Subscribe
+  public void onServiceCreate(ServiceInstalledEvent serviceInstalledEvent) throws AmbariException {
+    Cluster cluster = m_clusters.get().getCluster(serviceInstalledEvent.getClusterId());
+    updateData(ambariManagementController.getClusterMetadataOnServiceInstall(cluster, serviceInstalledEvent.getServiceName()));
+  }
+
+  @Subscribe
+  public void onClusterComponentsRepoUpdate(ClusterComponentsRepoChangedEvent clusterComponentsRepoChangedEvent) throws AmbariException {
+    Cluster cluster = m_clusters.get().getCluster(clusterComponentsRepoChangedEvent.getClusterId());
+    updateData(ambariManagementController.getClusterMetadataOnRepoUpdate(cluster));
+  }
 }
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/TopologyHolder.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/TopologyHolder.java
index 46bf7d5..0fcf3ec 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/TopologyHolder.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/TopologyHolder.java
@@ -30,8 +30,10 @@ import org.apache.ambari.server.agent.stomp.dto.TopologyCluster;
 import org.apache.ambari.server.agent.stomp.dto.TopologyComponent;
 import org.apache.ambari.server.agent.stomp.dto.TopologyHost;
 import org.apache.ambari.server.controller.AmbariManagementControllerImpl;
+import org.apache.ambari.server.events.ClusterComponentsRepoChangedEvent;
 import org.apache.ambari.server.events.TopologyAgentUpdateEvent;
 import org.apache.ambari.server.events.TopologyUpdateEvent;
+import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
 import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.Host;
@@ -41,6 +43,7 @@ import org.apache.ambari.server.state.ServiceComponentHost;
 import org.apache.ambari.server.state.StackId;
 import org.apache.commons.collections.CollectionUtils;
 
+import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
@@ -53,6 +56,11 @@ public class TopologyHolder extends AgentClusterDataHolder<TopologyUpdateEvent>
   @Inject
   private Clusters clusters;
 
+  @Inject
+  public TopologyHolder(AmbariEventPublisher ambariEventPublisher) {
+    ambariEventPublisher.register(this);
+  }
+
   @Override
   public TopologyUpdateEvent getUpdateIfChanged(String agentHash) throws AmbariException {
     TopologyUpdateEvent topologyUpdateEvent = super.getUpdateIfChanged(agentHash);
@@ -97,9 +105,9 @@ public class TopologyHolder extends AgentClusterDataHolder<TopologyUpdateEvent>
                 .setServiceName(sch.getServiceName())
                 .setVersion(sch.getVersion())
                 .setHostIds(hostOrderIds)
-                .setComponentLevelParams(ambariManagementController.getTopologyComponentLevelParams(stackId, serviceName,
+                .setComponentLevelParams(ambariManagementController.getTopologyComponentLevelParams(cl.getClusterId(), serviceName,
                     componentName, cl.getSecurityType()))
-                .setCommandParams(ambariManagementController.getTopologyCommandParams(stackId, serviceName, componentName))
+                .setCommandParams(ambariManagementController.getTopologyCommandParams(cl.getClusterId(), serviceName, componentName))
                 .build();
             topologyComponents.add(topologyComponent);
           }
@@ -182,4 +190,45 @@ public class TopologyHolder extends AgentClusterDataHolder<TopologyUpdateEvent>
   protected TopologyUpdateEvent getEmptyData() {
     return TopologyUpdateEvent.emptyUpdate();
   }
+
+  @Subscribe
+  public void onClusterComponentsRepoUpdate(ClusterComponentsRepoChangedEvent clusterComponentsRepoChangedEvent) throws AmbariException {
+    Long clusterId = clusterComponentsRepoChangedEvent.getClusterId();
+
+    TopologyCluster topologyCluster = new TopologyCluster();
+    topologyCluster.setTopologyComponents(getTopologyComponentRepos(clusterId));
+    TreeMap<String, TopologyCluster> topologyUpdates = new TreeMap<>();
+    topologyUpdates.put(Long.toString(clusterId), topologyCluster);
+    TopologyUpdateEvent topologyUpdateEvent = new TopologyUpdateEvent(topologyUpdates, TopologyUpdateEvent.EventType.UPDATE);
+    updateData(topologyUpdateEvent);
+  }
+
+  private Set<TopologyComponent> getTopologyComponentRepos(Long clusterId) throws AmbariException {
+    Set<TopologyComponent> topologyComponents = new HashSet<>();
+    Cluster cl = clusters.getCluster(clusterId);
+    for (Service service : cl.getServices().values()) {
+      for (ServiceComponent component : service.getServiceComponents().values()) {
+        Map<String, ServiceComponentHost> componentsMap = component.getServiceComponentHosts();
+        if (!componentsMap.isEmpty()) {
+
+          //TODO will be a need to change to multi-instance usage
+          ServiceComponentHost sch = componentsMap.entrySet().iterator().next().getValue();
+
+          String serviceName = sch.getServiceName();
+          String componentName = sch.getServiceComponentName();
+
+          TopologyComponent topologyComponent = TopologyComponent.newBuilder()
+              .setComponentName(sch.getServiceComponentName())
+              .setServiceName(sch.getServiceName())
+              .setVersion(sch.getVersion())
+              .setCommandParams(ambariManagementController.getTopologyCommandParams(cl.getClusterId(), serviceName, componentName))
+              .setComponentLevelParams(ambariManagementController.getTopologyComponentLevelParams(clusterId,
+                  serviceName, componentName, cl.getSecurityType()))
+              .build();
+          topologyComponents.add(topologyComponent);
+        }
+      }
+    }
+    return topologyComponents;
+  }
 }
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/TopologyComponent.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/TopologyComponent.java
index 9708b56..dc74c13 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/TopologyComponent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/TopologyComponent.java
@@ -35,11 +35,11 @@ public class TopologyComponent {
   private String serviceName;
   private String displayName;
   private String version;
-  private Set<Long> hostIds;
-  private Set<String> hostNames;
-  private Set<String> publicHostNames;
-  private TreeMap<String, String> componentLevelParams;
-  private TreeMap<String, String> commandParams;
+  private Set<Long> hostIds = new HashSet<>();
+  private Set<String> hostNames = new HashSet<>();
+  private Set<String> publicHostNames = new HashSet<>();
+  private TreeMap<String, String> componentLevelParams = new TreeMap<>();
+  private TreeMap<String, String> commandParams = new TreeMap<>();
 
   private TopologyComponent() {
   }
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 90d6151..006c4ff 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
@@ -48,6 +48,7 @@ import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.PACKAGE_L
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.REPO_INFO;
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT;
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT_TYPE;
+import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SERVICE_PACKAGE_FOLDER;
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SERVICE_REPO_INFO;
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.STACK_NAME;
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.STACK_VERSION;
@@ -791,8 +792,9 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
           .setHostIds(hostIds)
           .setHostNames(hostNames)
           .setPublicHostNames(publicHostNames)
-          .setComponentLevelParams(getTopologyComponentLevelParams(stackId, serviceName, componentName, cluster.getSecurityType()))
-          .setCommandParams(getTopologyCommandParams(stackId, serviceName, componentName))
+          .setComponentLevelParams(getTopologyComponentLevelParams(cluster.getClusterId(), serviceName, componentName,
+              cluster.getSecurityType()))
+          .setCommandParams(getTopologyCommandParams(cluster.getClusterId(), serviceName, componentName))
           .build();
       String clusterId = Long.toString(cluster.getClusterId());
       if (!topologyUpdates.containsKey(clusterId)) {
@@ -5582,26 +5584,8 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
 
       SecurityType securityType = cl.getSecurityType();
 
-      TreeMap<String, MetadataServiceInfo> serviceLevelParams = new TreeMap<>();
-      Collection<ServiceInfo> servicesInfo = ambariMetaInfo.getServices(stackId.getStackName(),
-          stackId.getStackVersion()).values();
-      for (ServiceInfo serviceInfo : servicesInfo) {
-        Long statusCommandTimeout = null;
-        if (serviceInfo.getCommandScript() != null) {
-          statusCommandTimeout = new Long (ambariCustomCommandExecutionHelper.getStatusCommandTimeout(serviceInfo));
-        }
-
-        String servicePackageFolder = serviceInfo.getServicePackageFolder();
-
-        serviceLevelParams.put(serviceInfo.getName(),
-            new MetadataServiceInfo(serviceInfo.getVersion(),
-                serviceInfo.isCredentialStoreEnabled(),
-                statusCommandTimeout,
-                servicePackageFolder));
-      }
-
       MetadataCluster metadataCluster = new MetadataCluster(securityType,
-          serviceLevelParams,
+          getMetadataServiceLevelParams(cl),
           getMetadataClusterLevelParams(cl, stackId));
       metadataClusters.put(Long.toString(cl.getClusterId()), metadataCluster);
     }
@@ -5617,26 +5601,8 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
 
     SecurityType securityType = cl.getSecurityType();
 
-    TreeMap<String, MetadataServiceInfo> serviceLevelParams = new TreeMap<>();
-    Collection<ServiceInfo> servicesInfo = ambariMetaInfo.getServices(stackId.getStackName(),
-        stackId.getStackVersion()).values();
-    for (ServiceInfo serviceInfo : servicesInfo) {
-      Long statusCommandTimeout = null;
-      if (serviceInfo.getCommandScript() != null) {
-        statusCommandTimeout = new Long(ambariCustomCommandExecutionHelper.getStatusCommandTimeout(serviceInfo));
-      }
-
-      String servicePackageFolder = serviceInfo.getServicePackageFolder();
-
-      serviceLevelParams.put(serviceInfo.getName(),
-          new MetadataServiceInfo(serviceInfo.getVersion(),
-              serviceInfo.isCredentialStoreEnabled(),
-              statusCommandTimeout,
-              servicePackageFolder));
-    }
-
     MetadataCluster metadataCluster = new MetadataCluster(securityType,
-        serviceLevelParams,
+        getMetadataServiceLevelParams(cl),
         getMetadataClusterLevelParams(cl, stackId));
     metadataClusters.put(Long.toString(cl.getClusterId()), metadataCluster);
 
@@ -5659,6 +5625,32 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
     return metadataUpdateEvent;
   }
 
+  public MetadataUpdateEvent getClusterMetadataOnRepoUpdate(Cluster cl) throws AmbariException {
+    TreeMap<String, MetadataCluster> metadataClusters = new TreeMap<>();
+
+    MetadataCluster metadataCluster = new MetadataCluster(null,
+        getMetadataServiceLevelParams(cl),
+        new TreeMap<>());
+    metadataClusters.put(Long.toString(cl.getClusterId()), metadataCluster);
+
+    MetadataUpdateEvent metadataUpdateEvent = new MetadataUpdateEvent(metadataClusters,
+        null);
+    return metadataUpdateEvent;
+  }
+
+  public MetadataUpdateEvent getClusterMetadataOnServiceInstall(Cluster cl, String serviceName) throws AmbariException {
+    TreeMap<String, MetadataCluster> metadataClusters = new TreeMap<>();
+
+    MetadataCluster metadataCluster = new MetadataCluster(null,
+        getMetadataServiceLevelParams(cl.getService(serviceName)),
+        new TreeMap<>());
+    metadataClusters.put(Long.toString(cl.getClusterId()), metadataCluster);
+
+    MetadataUpdateEvent metadataUpdateEvent = new MetadataUpdateEvent(metadataClusters,
+        null);
+    return metadataUpdateEvent;
+  }
+
   private String getClientsToUpdateConfigs(ComponentInfo componentInfo) {
     List<String> clientsToUpdateConfigsList = componentInfo.getClientsToUpdateConfigs();
     if (clientsToUpdateConfigsList == null) {
@@ -5682,53 +5674,81 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
   }
 
   //TODO will be a need to change to multi-instance usage
-  public TreeMap<String, String> getTopologyComponentLevelParams(StackId stackId, String serviceName, String componentName,
+  public TreeMap<String, String> getTopologyComponentLevelParams(Long clusterId, String serviceName, String componentName,
                                                              SecurityType clusterSecurityType) throws AmbariException {
-    ComponentInfo componentInfo = ambariMetaInfo.getComponent(
-        stackId.getStackName(), stackId.getStackVersion(),
-        serviceName, componentName);
 
     TreeMap<String, String> statusCommandParams = new TreeMap<>();
-    statusCommandParams.put(ExecutionCommand.KeyNames.CLIENTS_TO_UPDATE_CONFIGS,
-        getClientsToUpdateConfigs(componentInfo));
-    statusCommandParams.put(ExecutionCommand.KeyNames.UNLIMITED_KEY_JCE_REQUIRED,
-         Boolean.toString(getUnlimitedKeyJCERequirement(componentInfo, clusterSecurityType)));
+    RepositoryVersionEntity repositoryVersion = getComponentRepositoryVersion(clusterId, serviceName, componentName);
+    if (null != repositoryVersion) {
+      StackId stackId = repositoryVersion.getStackId();
+      ComponentInfo componentInfo = ambariMetaInfo.getComponent(
+          stackId.getStackName(), stackId.getStackVersion(),
+          serviceName, componentName);
+
+      statusCommandParams.put(ExecutionCommand.KeyNames.CLIENTS_TO_UPDATE_CONFIGS,
+          getClientsToUpdateConfigs(componentInfo));
+      statusCommandParams.put(ExecutionCommand.KeyNames.UNLIMITED_KEY_JCE_REQUIRED,
+          Boolean.toString(getUnlimitedKeyJCERequirement(componentInfo, clusterSecurityType)));
+    }
     return statusCommandParams;
   }
 
   //TODO will be a need to change to multi-instance usage
-  public TreeMap<String, String> getTopologyCommandParams(StackId stackId, String serviceName, String componentName) throws AmbariException {
-    ServiceInfo serviceInfo = ambariMetaInfo.getService(stackId.getStackName(),
-        stackId.getStackVersion(), serviceName);
-    ComponentInfo componentInfo = ambariMetaInfo.getComponent(
-        stackId.getStackName(), stackId.getStackVersion(),
-        serviceName, componentName);
-
-    String scriptName = null;
-    String scriptCommandTimeout = "";
-    CommandScriptDefinition script = componentInfo.getCommandScript();
-    if (serviceInfo.getSchemaVersion().equals(AmbariMetaInfo.SCHEMA_VERSION_2)) {
-      if (script != null) {
-        scriptName = script.getScript();
-        if (script.getTimeout() > 0) {
-          scriptCommandTimeout = String.valueOf(script.getTimeout());
+  public TreeMap<String, String> getTopologyCommandParams(Long clusterId, String serviceName, String componentName) throws AmbariException {
+    TreeMap<String, String> commandParams = new TreeMap<>();
+    RepositoryVersionEntity repositoryVersion = getComponentRepositoryVersion(clusterId, serviceName, componentName);
+    if (null != repositoryVersion) {
+      StackId stackId = repositoryVersion.getStackId();
+      ServiceInfo serviceInfo = ambariMetaInfo.getService(stackId.getStackName(),
+          stackId.getStackVersion(), serviceName);
+      ComponentInfo componentInfo = ambariMetaInfo.getComponent(
+          stackId.getStackName(), stackId.getStackVersion(),
+          serviceName, componentName);
+
+      commandParams.put(SERVICE_PACKAGE_FOLDER, serviceInfo.getServicePackageFolder());
+      String scriptName = null;
+      String scriptCommandTimeout = "";
+      CommandScriptDefinition script = componentInfo.getCommandScript();
+      if (serviceInfo.getSchemaVersion().equals(AmbariMetaInfo.SCHEMA_VERSION_2)) {
+        if (script != null) {
+          scriptName = script.getScript();
+          if (script.getTimeout() > 0) {
+            scriptCommandTimeout = String.valueOf(script.getTimeout());
+          }
+        } else {
+          String message = String.format("Component %s of service %s has not " +
+              "command script defined", componentName, serviceName);
+          throw new AmbariException(message);
         }
-      } else {
-        String message = String.format("Component %s of service %s has not " +
-            "command script defined", componentName, serviceName);
-        throw new AmbariException(message);
       }
-    }
-    String agentDefaultCommandTimeout = configs.getDefaultAgentTaskTimeout(false);
-    String actualTimeout = (!scriptCommandTimeout.equals("") ? scriptCommandTimeout : agentDefaultCommandTimeout);
+      String agentDefaultCommandTimeout = configs.getDefaultAgentTaskTimeout(false);
+      String actualTimeout = (!scriptCommandTimeout.equals("") ? scriptCommandTimeout : agentDefaultCommandTimeout);
 
-    TreeMap<String, String> commandParams = new TreeMap<>();
-    commandParams.put(COMMAND_TIMEOUT, actualTimeout);
-    commandParams.put(SCRIPT, scriptName);
-    commandParams.put(SCRIPT_TYPE, script.getScriptType().toString());
+      commandParams.put(COMMAND_TIMEOUT, actualTimeout);
+      commandParams.put(SCRIPT, scriptName);
+      commandParams.put(SCRIPT_TYPE, script.getScriptType().toString());
+    }
     return commandParams;
   }
 
+  private RepositoryVersionEntity getComponentRepositoryVersion(Long clusterId, String serviceName, String componentName) throws AmbariException {
+    RepositoryVersionEntity repositoryVersion = null;
+    if (!StringUtils.isEmpty(serviceName)) {
+      Service service = clusters.getCluster(clusterId).getService(serviceName);
+      if (null != service) {
+        repositoryVersion = service.getDesiredRepositoryVersion();
+
+        if (!StringUtils.isEmpty(componentName) && service.getServiceComponents().containsKey(componentName)) {
+          ServiceComponent serviceComponent = service.getServiceComponent(componentName);
+          if (null != serviceComponent) {
+            repositoryVersion = serviceComponent.getDesiredRepositoryVersion();
+          }
+        }
+      }
+    }
+    return repositoryVersion;
+  }
+
   public TreeMap<String, String> getMetadataClusterLevelParams(Cluster cluster, StackId stackId) throws AmbariException {
     TreeMap<String, String> clusterLevelParams = new TreeMap<>();
     clusterLevelParams.put(STACK_NAME, stackId.getStackName());
@@ -5792,6 +5812,41 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
     return clusterLevelParams;
   }
 
+  public TreeMap<String, MetadataServiceInfo> getMetadataServiceLevelParams(Cluster cluster) throws AmbariException {
+    TreeMap<String, MetadataServiceInfo> serviceLevelParams = new TreeMap<>();
+    for (Map.Entry<String, Service> serviceEntry : cluster.getServices().entrySet()) {
+      Service service = serviceEntry.getValue();
+      serviceLevelParams.putAll(getMetadataServiceLevelParams(service));
+    }
+    return serviceLevelParams;
+  }
+
+  public TreeMap<String, MetadataServiceInfo> getMetadataServiceLevelParams(Service service) throws AmbariException {
+    TreeMap<String, MetadataServiceInfo> serviceLevelParams = new TreeMap<>();
+
+    RepositoryVersionEntity repositoryVersion = service.getDesiredRepositoryVersion();
+
+    if (null != repositoryVersion) {
+      StackId serviceStackId = repositoryVersion.getStackId();
+
+      ServiceInfo serviceInfo = ambariMetaInfo.getService(serviceStackId.getStackName(),
+          serviceStackId.getStackVersion(), service.getName());
+      Long statusCommandTimeout = null;
+      if (serviceInfo.getCommandScript() != null) {
+        statusCommandTimeout = new Long(ambariCustomCommandExecutionHelper.getStatusCommandTimeout(serviceInfo));
+      }
+
+      String servicePackageFolder = serviceInfo.getServicePackageFolder();
+
+      serviceLevelParams.put(serviceInfo.getName(),
+          new MetadataServiceInfo(serviceInfo.getVersion(),
+              serviceInfo.isCredentialStoreEnabled(),
+              statusCommandTimeout,
+              servicePackageFolder));
+    }
+    return serviceLevelParams;
+  }
+
   public TreeMap<String, String> getMetadataAmbariLevelParams() throws AmbariException {
     TreeMap<String, String> clusterLevelParams = new TreeMap<>();
     clusterLevelParams.put(JDK_LOCATION, getJdkResourceUrl());
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
index b07e834..7583230 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
@@ -565,10 +565,7 @@ public class HostResourceProvider extends AbstractControllerResourceProvider {
             addedHost.getRackInfo(),
             addedHost.getIPv4()));
         HostLevelParamsUpdateEvent hostLevelParamsUpdateEvent = new HostLevelParamsUpdateEvent(clusterId, new HostLevelParamsCluster(
-            getManagementController().retrieveHostRepositories(cl, addedHost),
-            recoveryConfigHelper.getRecoveryConfig(cl.getClusterName(),
-                addedHost.getHostName())
-        ));
+            getManagementController().retrieveHostRepositories(cl, addedHost), null));
         hostLevelParamsUpdateEvent.setHostId(addedHost.getHostId());
         hostLevelParamsUpdateEvents.add(hostLevelParamsUpdateEvent);
       }
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
index 9669267..bfe5620 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
@@ -782,6 +782,7 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
             new StackId(targetStack.getStackName(), targetStack.getStackVersion()));
       }
       s_upgradeHelper.updateDesiredRepositoriesAndConfigs(upgradeContext);
+      s_upgradeHelper.publishDesiredRepositoriesUpdates(upgradeContext);
       if (direction == Direction.DOWNGRADE) {
         StackId targetStack = upgradeContext.getCluster().getCurrentStackVersion();
         cluster.setDesiredStackVersion(targetStack);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/AmbariEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/events/AmbariEvent.java
index 754d611..a5900a3 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/AmbariEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/AmbariEvent.java
@@ -170,7 +170,12 @@ public abstract class AmbariEvent {
     /**
      * Host component's stale config status has been changed.
      */
-    STALE_CONFIGS_UPDATE;
+    STALE_CONFIGS_UPDATE,
+
+    /**
+     * Service component's repo has been changed..
+     */
+    SERVICE_COMPONENT_REPO_CHANGE;
   }
 
   /**
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/ClusterComponentsRepoChangedEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/events/ClusterComponentsRepoChangedEvent.java
new file mode 100644
index 0000000..440562f
--- /dev/null
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/ClusterComponentsRepoChangedEvent.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ambari.server.events;
+
+public class ClusterComponentsRepoChangedEvent extends ClusterEvent {
+
+  public ClusterComponentsRepoChangedEvent(long clusterId) {
+    super(AmbariEventType.SERVICE_COMPONENT_REPO_CHANGE, clusterId);
+  }
+}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/UpdateDesiredRepositoryAction.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/UpdateDesiredRepositoryAction.java
index 3c6c8e1..b5005a7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/UpdateDesiredRepositoryAction.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/UpdateDesiredRepositoryAction.java
@@ -92,7 +92,9 @@ public class UpdateDesiredRepositoryAction extends AbstractUpgradeServerAction {
       LOG.warn(String.format("Did not receive role parameter %s, will save configs using anonymous username %s", ServerAction.ACTION_USER_NAME, userName));
     }
 
-    return updateDesiredRepositoryVersion(cluster, upgradeContext, userName);
+    CommandReport commandReport = updateDesiredRepositoryVersion(cluster, upgradeContext, userName);
+    m_upgradeHelper.publishDesiredRepositoriesUpdates(upgradeContext);
+    return commandReport;
   }
 
   /**
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
index 2b4f71a..1f60485 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
@@ -53,7 +53,9 @@ import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
 import org.apache.ambari.server.controller.utilities.ClusterControllerHelper;
 import org.apache.ambari.server.controller.utilities.PredicateBuilder;
 import org.apache.ambari.server.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.events.ClusterComponentsRepoChangedEvent;
 import org.apache.ambari.server.events.listeners.upgrade.StackVersionListener;
+import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
 import org.apache.ambari.server.orm.dao.ServiceConfigDAO;
 import org.apache.ambari.server.orm.entities.ClusterConfigEntity;
 import org.apache.ambari.server.orm.entities.RepositoryVersionEntity;
@@ -214,6 +216,9 @@ public class UpgradeHelper {
   @Inject
   ServiceConfigDAO m_serviceConfigDAO;
 
+  @Inject
+  private AmbariEventPublisher ambariEventPublisher;
+
   /**
    * Get right Upgrade Pack, depends on stack, direction and upgrade type
    * information
@@ -839,6 +844,11 @@ public class UpgradeHelper {
     processConfigurationsIfRequired(upgradeContext);
   }
 
+  public void publishDesiredRepositoriesUpdates(UpgradeContext upgradeContext) throws AmbariException {
+    Cluster cluster = upgradeContext.getCluster();
+    ambariEventPublisher.publish(new ClusterComponentsRepoChangedEvent(cluster.getClusterId()));
+  }
+
   /**
    * Transitions all affected components to {@link UpgradeState#IN_PROGRESS}.
    * Transition is performed only for components that advertise their version.
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
index 2bdce72..cf1cce4 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
@@ -110,7 +110,7 @@ for host in ams_collector_hosts.split(","):
   metric_truststore_alias_list.append(metric_truststore_alias)
 
 agent_cache_dir = config['agentLevelParams']['agentCacheDir']
-service_package_folder = config['serviceLevelParams']['service_package_folder']
+service_package_folder = config['commandParams']['service_package_folder']
 stack_name = default("/clusterLevelParams/stack_name", None)
 dashboards_dirs = []
 # Stack specific
diff --git a/ambari-server/src/main/resources/custom_actions/scripts/ru_execute_tasks.py b/ambari-server/src/main/resources/custom_actions/scripts/ru_execute_tasks.py
index d12fa59..11537f8 100644
--- a/ambari-server/src/main/resources/custom_actions/scripts/ru_execute_tasks.py
+++ b/ambari-server/src/main/resources/custom_actions/scripts/ru_execute_tasks.py
@@ -103,6 +103,8 @@ class ExecuteUpgradeTasks(Script):
 
     # These 2 variables are optional
     service_package_folder = default('/commandParams/service_package_folder', None)
+    if service_package_folder is None:
+      service_package_folder = default('/serviceLevelParams/service_package_folder', None)
     hooks_folder = default('/commandParams/hooks_folder', None)
 
     tasks = json.loads(config['roleParams']['tasks'])
@@ -119,7 +121,7 @@ class ExecuteUpgradeTasks(Script):
 
           if service_package_folder and hooks_folder:
             command_paths = {
-              "serviceLevelParams": {
+              "commandParams": {
                 "service_package_folder": service_package_folder,
               },
               "clusterLevelParams": {
diff --git a/ambari-server/src/main/resources/stack-hooks/after-INSTALL/scripts/params.py b/ambari-server/src/main/resources/stack-hooks/after-INSTALL/scripts/params.py
index 91c75dd..c46dd26 100644
--- a/ambari-server/src/main/resources/stack-hooks/after-INSTALL/scripts/params.py
+++ b/ambari-server/src/main/resources/stack-hooks/after-INSTALL/scripts/params.py
@@ -50,7 +50,7 @@ service_name = config['serviceName']
 logsearch_logfeeder_conf = "/usr/lib/ambari-logsearch-logfeeder/conf"
 
 agent_cache_dir = config['agentLevelParams']['agentCacheDir']
-service_package_folder = config['serviceLevelParams']['service_package_folder']
+service_package_folder = config['commandParams']['service_package_folder']
 logsearch_service_name = service_name.lower().replace("_", "-")
 logsearch_config_file_name = 'input.config-' + logsearch_service_name + ".json"
 logsearch_config_file_path = agent_cache_dir + "/" + service_package_folder + "/templates/" + logsearch_config_file_name + ".j2"
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java
index 804a9ad..33ea633 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java
@@ -18,7 +18,6 @@
 package org.apache.ambari.server.agent;
 
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.HOOKS_FOLDER;
-import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SERVICE_PACKAGE_FOLDER;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -225,7 +224,6 @@ public class TestHeartbeatMonitor {
       assertEquals(isDataNode, execCmd != null);
       if (execCmd != null) {
         Map<String, String> commandParams = execCmd.getCommandParams();
-        assertTrue(SERVICE_PACKAGE_FOLDER + " should be included", commandParams.containsKey(SERVICE_PACKAGE_FOLDER));
         assertTrue(HOOKS_FOLDER + " should be included", commandParams.containsKey(HOOKS_FOLDER));
       }
     }

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