You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mr...@apache.org on 2017/10/30 19:04:47 UTC
[11/30] ambari git commit: AMBARI-22244. Update service component API
call to work for second service instance (adoroszlai)
AMBARI-22244. Update service component API call to work for second service instance (adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/17e4330d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/17e4330d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/17e4330d
Branch: refs/heads/branch-feature-AMBARI-14714-ui
Commit: 17e4330db3f4813db035e31cd0d4be254c6ecd02
Parents: 58c8339
Author: Attila Doroszlai <ad...@hortonworks.com>
Authored: Mon Oct 9 13:46:56 2017 +0200
Committer: Attila Doroszlai <ad...@hortonworks.com>
Committed: Tue Oct 17 20:23:05 2017 +0200
----------------------------------------------------------------------
.../actionmanager/ExecutionCommandWrapper.java | 6 ++++--
.../apache/ambari/server/agent/HeartBeatHandler.java | 2 +-
.../server/alerts/ComponentVersionAlertRunnable.java | 2 +-
.../ambari/server/api/services/AmbariMetaInfo.java | 2 +-
.../ambari/server/api/services/ComponentService.java | 8 ++++----
.../server/checks/ComponentsExistInRepoCheck.java | 7 ++++---
.../apache/ambari/server/checks/ServicesUpCheck.java | 4 +---
.../controller/AmbariActionExecutionHelper.java | 6 +++---
.../AmbariCustomCommandExecutionHelper.java | 8 ++++----
.../controller/AmbariManagementControllerImpl.java | 10 +++++-----
.../internal/ClientConfigResourceProvider.java | 15 ++++++---------
.../ClusterStackVersionResourceProvider.java | 7 ++++---
.../internal/ComponentResourceProvider.java | 8 ++++----
.../internal/HostStackVersionResourceProvider.java | 4 ++--
.../controller/internal/ServiceResourceProvider.java | 2 +-
.../internal/StackDefinedPropertyProvider.java | 2 +-
.../logging/LoggingSearchPropertyProvider.java | 2 +-
.../metrics/timeline/AMSPropertyProvider.java | 2 +-
.../server/controller/utilities/DatabaseChecker.java | 2 +-
.../state/DefaultServiceCalculatedState.java | 2 +-
.../utilities/state/HBaseServiceCalculatedState.java | 2 +-
.../utilities/state/HDFSServiceCalculatedState.java | 2 +-
.../utilities/state/HiveServiceCalculatedState.java | 2 +-
.../utilities/state/OozieServiceCalculatedState.java | 2 +-
.../utilities/state/YARNServiceCalculatedState.java | 2 +-
.../alerts/AlertMaintenanceModeListener.java | 2 +-
.../listeners/alerts/AlertServiceStateListener.java | 2 +-
.../upgrade/HostVersionOutOfSyncListener.java | 3 +--
.../listeners/upgrade/StackVersionListener.java | 2 +-
.../org/apache/ambari/server/mpack/MpackManager.java | 2 +-
.../serveraction/upgrades/FinalizeUpgradeAction.java | 2 +-
.../org/apache/ambari/server/state/ConfigHelper.java | 10 +++++-----
.../ambari/server/state/ServiceComponentImpl.java | 4 ++--
.../org/apache/ambari/server/state/ServiceImpl.java | 3 ++-
.../apache/ambari/server/state/UpgradeHelper.java | 2 +-
.../server/state/alert/AlertDefinitionHash.java | 4 ++--
.../ambari/server/state/cluster/ClusterImpl.java | 2 +-
.../apache/ambari/server/state/host/HostImpl.java | 2 +-
.../state/stack/upgrade/HostOrderGrouping.java | 2 +-
.../state/stack/upgrade/ServiceCheckGrouping.java | 2 +-
.../state/svccomphost/ServiceComponentHostImpl.java | 2 +-
.../svccomphost/ServiceComponentHostSummary.java | 1 -
42 files changed, 78 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
----------------------------------------------------------------------
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 ff13d0b..ed2819a 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
@@ -237,11 +237,13 @@ public class ExecutionCommandWrapper {
// set the repository version for the component this command is for -
// always use the current desired version
String serviceName = executionCommand.getServiceName();
+ String serviceType = null;
try {
RepositoryVersionEntity repositoryVersion = null;
if (!StringUtils.isEmpty(serviceName)) {
Service service = cluster.getService(serviceName);
if (null != service) {
+ serviceType = service.getServiceType();
repositoryVersion = service.getDesiredRepositoryVersion();
String componentName = executionCommand.getComponentName();
@@ -273,9 +275,9 @@ public class ExecutionCommandWrapper {
}
if (!commandParams.containsKey(SERVICE_PACKAGE_FOLDER)) {
- if (!StringUtils.isEmpty(serviceName)) {
+ if (!StringUtils.isEmpty(serviceType)) {
ServiceInfo serviceInfo = ambariMetaInfo.getService(stackId.getStackName(),
- stackId.getStackVersion(), serviceName);
+ stackId.getStackVersion(), serviceType);
commandParams.put(SERVICE_PACKAGE_FOLDER, serviceInfo.getServicePackageFolder());
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
index bb298d5..daff89f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
@@ -542,7 +542,7 @@ public class HeartBeatHandler {
StackId stackId = component.getDesiredStackId();
ComponentInfo componentInfo = ambariMetaInfo.getComponent(
- stackId.getStackName(), stackId.getStackVersion(), service.getName(), component.getName());
+ stackId.getStackName(), stackId.getStackVersion(), service.getServiceType(), component.getName());
componentsMap.get(service.getName()).put(component.getName(), componentInfo.getCategory());
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/alerts/ComponentVersionAlertRunnable.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/alerts/ComponentVersionAlertRunnable.java b/ambari-server/src/main/java/org/apache/ambari/server/alerts/ComponentVersionAlertRunnable.java
index 45cc973..977dc9e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/alerts/ComponentVersionAlertRunnable.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/alerts/ComponentVersionAlertRunnable.java
@@ -119,7 +119,7 @@ public class ComponentVersionAlertRunnable extends AlertRunnable {
final ComponentInfo componentInfo;
try {
componentInfo = m_metaInfo.getComponent(desiredStackId.getStackName(),
- desiredStackId.getStackVersion(), hostComponent.getServiceName(),
+ desiredStackId.getStackVersion(), hostComponent.getServiceType(),
hostComponent.getServiceComponentName());
} catch (AmbariException ambariException) {
// throw an UNKNOWN response if we can't load component info
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index 2bb450b..1c0a555 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -1184,7 +1184,7 @@ public class AmbariMetaInfo {
for (Service service : cluster.getServices().values()) {
ServiceInfo stackService = getService(service.getDesiredStackId().getStackName(),
- service.getDesiredStackId().getStackVersion(), service.getName());
+ service.getDesiredStackId().getStackVersion(), service.getServiceType());
if (null == stackService) {
continue;
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java
index 60230f6..fc73a53 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java
@@ -222,10 +222,10 @@ public class ComponentService extends BaseService {
* @return a component resource instance
*/
ResourceInstance createComponentResource(String componentName) {
- Map<Resource.Type,String> mapIds = new HashMap<Resource.Type, String>();
- mapIds.put(Resource.Type.Cluster, m_clusterName == null? null : m_clusterName.toString());
- mapIds.put(Resource.Type.ServiceGroup, m_serviceGroupName == null? null : m_serviceGroupName.toString());
- mapIds.put(Resource.Type.Service, m_serviceName == null? null : m_serviceName.toString());
+ Map<Resource.Type,String> mapIds = new HashMap<>();
+ mapIds.put(Resource.Type.Cluster, m_clusterName);
+ mapIds.put(Resource.Type.ServiceGroup, m_serviceGroupName);
+ mapIds.put(Resource.Type.Service, m_serviceName);
mapIds.put(Resource.Type.Component, componentName);
return createResource(Resource.Type.Component, mapIds);
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/checks/ComponentsExistInRepoCheck.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/ComponentsExistInRepoCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/ComponentsExistInRepoCheck.java
index 6949257..3ec3268 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/ComponentsExistInRepoCheck.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/ComponentsExistInRepoCheck.java
@@ -74,20 +74,21 @@ public class ComponentsExistInRepoCheck extends AbstractCheckDescriptor {
Set<String> servicesInUpgrade = getServicesInUpgrade(request);
for (String serviceName : servicesInUpgrade) {
try {
+ Service service = cluster.getService(serviceName);
+ String serviceType = service.getServiceType();
ServiceInfo serviceInfo = ambariMetaInfo.get().getService(targetStack.getStackName(),
- targetStack.getStackVersion(), serviceName);
+ targetStack.getStackVersion(), serviceType);
if (serviceInfo.isDeleted() || !serviceInfo.isValid()) {
failedServices.add(serviceName);
continue;
}
- Service service = cluster.getService(serviceName);
Map<String, ServiceComponent> componentsInUpgrade = service.getServiceComponents();
for (String componentName : componentsInUpgrade.keySet()) {
try {
ComponentInfo componentInfo = ambariMetaInfo.get().getComponent(
- targetStack.getStackName(), targetStack.getStackVersion(), serviceName,
+ targetStack.getStackName(), targetStack.getStackVersion(), serviceType,
componentName);
// if this component isn't included in the upgrade, then skip it
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesUpCheck.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesUpCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesUpCheck.java
index 5ecce88..6106325 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesUpCheck.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesUpCheck.java
@@ -133,7 +133,7 @@ public class ServicesUpCheck extends AbstractCheckDescriptor {
if (!serviceComponent.isMasterComponent()) {
StackId stackId = service.getDesiredStackId();
ComponentInfo componentInfo = ambariMetaInfo.get().getComponent(stackId.getStackName(),
- stackId.getStackVersion(), serviceComponent.getServiceName(),
+ stackId.getStackVersion(), serviceComponent.getServiceType(),
serviceComponent.getName());
String cardinality = componentInfo.getCardinality();
@@ -195,8 +195,6 @@ public class ServicesUpCheck extends AbstractCheckDescriptor {
* purposes of this check. Component type, maintenance mode, and state are
* taken into account.
*
- * @param clusters
- * the clusters instance
* @param cluster
* the cluster
* @param serviceComponent
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
index 0f6eb90..ee582b3 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
@@ -168,7 +168,7 @@ public class AmbariActionExecutionHelper {
ServiceInfo serviceInfo;
try {
serviceInfo = ambariMetaInfo.getService(stackId.getStackName(), stackId.getStackVersion(),
- targetService);
+ service.getServiceType());
} catch (StackAccessException se) {
serviceInfo = null;
}
@@ -204,7 +204,7 @@ public class AmbariActionExecutionHelper {
ComponentInfo compInfo;
try {
compInfo = ambariMetaInfo.getComponent(stackId.getStackName(), stackId.getStackVersion(),
- targetService, targetComponent);
+ service.getServiceType(), targetComponent);
} catch (StackAccessException se) {
compInfo = null;
}
@@ -300,7 +300,7 @@ public class AmbariActionExecutionHelper {
try {
componentInfo = ambariMetaInfo.getComponent(stackId.getStackName(),
- stackId.getStackVersion(), serviceName, componentName);
+ stackId.getStackVersion(), service.getServiceType(), componentName);
} catch (ObjectNotFoundException e) {
// do nothing, componentId is checked for null later
LOG.error("Did not find service {} and component {} in stack {}.", serviceName, componentName, stackId.getStackName());
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
----------------------------------------------------------------------
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 ff35e80..b9416d1 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
@@ -205,7 +205,7 @@ public class AmbariCustomCommandExecutionHelper {
ComponentInfo componentInfo = ambariMetaInfo.getComponent(
stackId.getStackName(), stackId.getStackVersion(),
- serviceName, componentName);
+ service.getServiceType(), componentName);
return !(!componentInfo.isCustomCommand(commandName) &&
!actionMetadata.isDefaultHostComponentCommand(commandName));
@@ -452,7 +452,7 @@ public class AmbariCustomCommandExecutionHelper {
ComponentInfo componentInfo = ambariMetaInfo.getComponent(
stackId.getStackName(), stackId.getStackVersion(),
- serviceName, componentName);
+ service.getServiceType(), componentName);
if (serviceInfo.getSchemaVersion().equals(AmbariMetaInfo.SCHEMA_VERSION_2)) {
// Service check command is not custom command
@@ -723,7 +723,7 @@ public class AmbariCustomCommandExecutionHelper {
AmbariMetaInfo ambariMetaInfo = managementController.getAmbariMetaInfo();
ServiceInfo serviceInfo = ambariMetaInfo.getService(stackId.getStackName(),
- stackId.getStackVersion(), serviceName);
+ stackId.getStackVersion(), service.getServiceType());
StackInfo stackInfo = ambariMetaInfo.getStack(stackId.getStackName(),
stackId.getStackVersion());
@@ -1445,7 +1445,7 @@ public class AmbariCustomCommandExecutionHelper {
ComponentInfo componentInfo = ambariMetaInfo.getComponent(
stackId.getStackName(), stackId.getStackVersion(),
- serviceName, componentName);
+ service.getServiceType(), componentName);
List<String> clientsToUpdateConfigsList = componentInfo.getClientsToUpdateConfigs();
if (clientsToUpdateConfigsList == null) {
clientsToUpdateConfigsList = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------
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 58f1cbd..8a038cc 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
@@ -2262,7 +2262,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
getServiceComponent(componentName);
StackId stackId = sc.getDesiredStackId();
ComponentInfo compInfo = ambariMetaInfo.getComponent(
- stackId.getStackName(), stackId.getStackVersion(), serviceName,
+ stackId.getStackName(), stackId.getStackVersion(), s.getServiceType(),
componentName);
if (runSmokeTest && compInfo.isMaster() &&
// op lvl handling for service component
@@ -2409,10 +2409,10 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
StackId stackId = scHost.getServiceComponent().getDesiredStackId();
ServiceInfo serviceInfo = ambariMetaInfo.getService(stackId.getStackName(),
- stackId.getStackVersion(), serviceName);
+ stackId.getStackVersion(), scHost.getServiceType());
ComponentInfo componentInfo = ambariMetaInfo.getComponent(
stackId.getStackName(), stackId.getStackVersion(),
- serviceName, componentName);
+ scHost.getServiceType(), componentName);
StackInfo stackInfo = ambariMetaInfo.getStack(stackId.getStackName(),
stackId.getStackVersion());
@@ -2997,7 +2997,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
case STARTED:
StackId stackId = serviceComponent.getDesiredStackId();
ComponentInfo compInfo = ambariMetaInfo.getComponent(
- stackId.getStackName(), stackId.getStackVersion(), scHost.getServiceName(),
+ stackId.getStackName(), stackId.getStackVersion(), scHost.getServiceType(),
scHost.getServiceComponentName());
if (oldSchState == State.INSTALLED ||
@@ -4115,7 +4115,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
StackId stackId = service.getDesiredStackId();
ComponentInfo compInfo =
ambariMetaInfo.getService(stackId.getStackName(),
- stackId.getStackVersion(), service.getName()).getClientComponent();
+ stackId.getStackVersion(), service.getServiceType()).getClientComponent();
if (compInfo != null) {
try {
ServiceComponent serviceComponent =
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
index ca80961..28acdb3 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
@@ -234,10 +234,10 @@ public class ClientConfigResourceProvider extends AbstractControllerResourceProv
StackId stackId = component.getDesiredStackId();
componentInfo = managementController.getAmbariMetaInfo().
- getComponent(stackId.getStackName(), stackId.getStackVersion(), serviceName, componentName);
+ getComponent(stackId.getStackName(), stackId.getStackVersion(), service.getServiceType(), componentName);
packageFolder = managementController.getAmbariMetaInfo().
- getService(stackId.getStackName(), stackId.getStackVersion(), serviceName).getServicePackageFolder();
+ getService(stackId.getStackName(), stackId.getStackVersion(), service.getServiceType()).getServicePackageFolder();
String commandScript = componentInfo.getCommandScript().getScript();
List<ClientConfigFileDefinition> clientConfigFiles = componentInfo.getClientConfigFiles();
@@ -341,12 +341,9 @@ public class ClientConfigResourceProvider extends AbstractControllerResourceProv
SecretReference.replacePasswordsWithReferences(propertiesTypes, configProperties, configType, configVersion);
}
- Map<String, Set<String>> clusterHostInfo = null;
- ServiceInfo serviceInfo = null;
- String osFamily = null;
- clusterHostInfo = StageUtils.getClusterHostInfo(cluster);
- serviceInfo = managementController.getAmbariMetaInfo().getService(stackId.getStackName(),
- stackId.getStackVersion(), serviceName);
+ Map<String, Set<String>> clusterHostInfo = StageUtils.getClusterHostInfo(cluster);
+ ServiceInfo serviceInfo = managementController.getAmbariMetaInfo().getService(stackId.getStackName(),
+ stackId.getStackVersion(), response.getServiceType());
try {
clusterHostInfo = StageUtils.substituteHostIndexes(clusterHostInfo);
} catch (AmbariException e) {
@@ -357,7 +354,7 @@ public class ClientConfigResourceProvider extends AbstractControllerResourceProv
// translated to a SystemException.
throw new SystemException(e.getMessage(), e);
}
- osFamily = clusters.getHost(hostName).getOsFamily();
+ String osFamily = clusters.getHost(hostName).getOsFamily();
TreeMap<String, String> hostLevelParams = new TreeMap<>();
StageUtils.useStackJdkIfExists(hostLevelParams, configs);
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index ba5a4e7..da6cbdf 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -696,8 +696,9 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou
Set<String> servicesOnHost = new HashSet<>();
List<ServiceComponentHost> components = cluster.getServiceComponentHosts(host.getHostName());
for (ServiceComponentHost component : components) {
- if (repoServices.isEmpty() || repoServices.contains(component.getServiceName())) {
- servicesOnHost.add(component.getServiceName());
+ String serviceType = component.getServiceType();
+ if (repoServices.isEmpty() || repoServices.contains(serviceType)) {
+ servicesOnHost.add(serviceType);
}
}
@@ -742,7 +743,7 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou
ComponentInfo componentInfo;
try {
componentInfo = ami.getComponent(stackId.getStackName(),
- stackId.getStackVersion(), component.getServiceName(), component.getServiceComponentName());
+ stackId.getStackVersion(), component.getServiceType(), component.getServiceComponentName());
} catch (AmbariException e) {
// It is possible that the component has been removed from the new stack
// (example: STORM_REST_API has been removed from HDP-2.2)
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
index f7559c6..7ef18ed 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
@@ -470,10 +470,10 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
} else {
StackId stackId = s.getDesiredStackId();
ComponentInfo componentInfo = ambariMetaInfo.getComponent(stackId.getStackName(),
- stackId.getStackVersion(), s.getName(), request.getComponentName());
+ stackId.getStackVersion(), s.getServiceType(), request.getComponentName());
if (componentInfo == null) {
throw new AmbariException("Could not get component information from stack definition: Stack=" +
- stackId + ", Service=" + s.getName() + ", Component=" + request.getComponentName());
+ stackId + ", Service=" + s.getServiceType() + ", Component=" + request.getComponentName());
}
sc.setRecoveryEnabled(componentInfo.isRecoveryEnabled());
LOG.info("Component: {}, recovery_enabled from stack definition:{}", componentInfo.getName(),
@@ -531,7 +531,7 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
try {
ComponentInfo componentInfo = ambariMetaInfo.getComponent(stackId.getStackName(),
- stackId.getStackVersion(), s.getName(), request.getComponentName());
+ stackId.getStackVersion(), s.getServiceType(), request.getComponentName());
category = componentInfo.getCategory();
if (category != null) {
serviceComponentResponse.setCategory(category);
@@ -565,7 +565,7 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
ServiceComponentResponse serviceComponentResponse = sc.convertToResponse();
try {
ComponentInfo componentInfo = ambariMetaInfo.getComponent(stackId.getStackName(),
- stackId.getStackVersion(), s.getName(), sc.getName());
+ stackId.getStackVersion(), s.getServiceType(), sc.getName());
category = componentInfo.getCategory();
if (category != null) {
serviceComponentResponse.setCategory(category);
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
index ba5fccc..405d608 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
@@ -410,7 +410,7 @@ public class HostStackVersionResourceProvider extends AbstractControllerResource
throw new IllegalArgumentException("Components list contains a component with no 'name' property");
}
- String serviceName = null;
+ String serviceName;
try {
serviceName = ami.getComponentToService(stackName, stackVersion, componentName.trim().toUpperCase());
if (serviceName == null) {
@@ -426,7 +426,7 @@ public class HostStackVersionResourceProvider extends AbstractControllerResource
} else {
List<ServiceComponentHost> components = cluster.getServiceComponentHosts(host.getHostName());
for (ServiceComponentHost component : components) {
- servicesOnHost.add(component.getServiceName());
+ servicesOnHost.add(component.getServiceType());
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
index 252d772..4ea7a7c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
@@ -920,7 +920,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
StackId sid = service.getDesiredStackId();
if ( ambariMetaInfo.getComponent(
- sid.getStackName(), sid.getStackVersion(), sc.getServiceName(),
+ sid.getStackName(), sid.getStackVersion(), sc.getServiceType(),
sch.getServiceComponentName()).isMaster()) {
throw new IllegalArgumentException(error);
} else {
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java
index 8c2198b..2b57d17 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java
@@ -174,7 +174,7 @@ public class StackDefinedPropertyProvider implements PropertyProvider {
StackId stack = service.getDesiredStackId();
List<MetricDefinition> defs = metaInfo.getMetrics(
- stack.getStackName(), stack.getStackVersion(), service.getName(), componentName, type.name());
+ stack.getStackName(), stack.getStackVersion(), service.getServiceType(), componentName, type.name());
if (null == defs || 0 == defs.size()) {
continue;
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingSearchPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingSearchPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingSearchPropertyProvider.java
index 0cd55c3..70d9654 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingSearchPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingSearchPropertyProvider.java
@@ -196,7 +196,7 @@ public class LoggingSearchPropertyProvider implements PropertyProvider {
final String stackVersion = stackId.getStackVersion();
ComponentInfo componentInfo =
- metaInfo.getComponent(stackName, stackVersion, serviceName, componentName);
+ metaInfo.getComponent(stackName, stackVersion, service.getServiceType(), componentName);
if (componentInfo != null) {
List<LogDefinition> listOfLogs =
componentInfo.getLogs();
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
index cae330b..f6e50c9 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
@@ -318,7 +318,7 @@ public abstract class AMSPropertyProvider extends MetricsPropertyProvider {
String stackName = stackId.getStackName();
String version = stackId.getStackVersion();
AmbariMetaInfo ambariMetaInfo = managementController.getAmbariMetaInfo();
- String serviceName = service.getName();
+ String serviceName = service.getServiceType();
String timeLineAppId = ambariMetaInfo.getComponent(stackName, version, serviceName, componentName).getTimelineAppid();
if (timeLineAppId != null){
timelineAppIdCache.put(componentName, timeLineAppId);
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/DatabaseChecker.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/DatabaseChecker.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/DatabaseChecker.java
index e3f4e1a..2620f38 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/DatabaseChecker.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/DatabaseChecker.java
@@ -110,7 +110,7 @@ public class DatabaseChecker {
ComponentInfo componentInfo = ambariMetaInfo.getComponent(
stackId.getStackName(), stackId.getStackVersion(),
- clusterServiceEntity.getServiceName(), scDesiredStateEnity.getComponentName());
+ clusterServiceEntity.getServiceType(), scDesiredStateEnity.getComponentName());
boolean zeroCardinality = componentInfo.getCardinality() == null
|| componentInfo.getCardinality().startsWith("0")
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/DefaultServiceCalculatedState.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/DefaultServiceCalculatedState.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/DefaultServiceCalculatedState.java
index 603e650..70871d0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/DefaultServiceCalculatedState.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/DefaultServiceCalculatedState.java
@@ -108,7 +108,7 @@ public class DefaultServiceCalculatedState implements ServiceCalculatedState {
for (ServiceComponentHostResponse hostComponentResponse : hostComponentResponses ) {
try {
ComponentInfo componentInfo = ambariMetaInfo.getComponent(stackId.getStackName(),
- stackId.getStackVersion(), hostComponentResponse.getServiceName(),
+ stackId.getStackVersion(), hostComponentResponse.getServiceType(),
hostComponentResponse.getComponentName());
State state = getHostComponentState(hostComponentResponse);
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HBaseServiceCalculatedState.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HBaseServiceCalculatedState.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HBaseServiceCalculatedState.java
index 765e6fc..dd15461 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HBaseServiceCalculatedState.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HBaseServiceCalculatedState.java
@@ -61,7 +61,7 @@ public final class HBaseServiceCalculatedState extends DefaultServiceCalculatedS
for (ServiceComponentHostResponse hostComponentResponse : hostComponentResponses ) {
try {
ComponentInfo componentInfo = ambariMetaInfo.getComponent(stackId.getStackName(),
- stackId.getStackVersion(), hostComponentResponse.getServiceName(),
+ stackId.getStackVersion(), hostComponentResponse.getServiceType(),
hostComponentResponse.getComponentName());
if (componentInfo.isMaster()) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HDFSServiceCalculatedState.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HDFSServiceCalculatedState.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HDFSServiceCalculatedState.java
index 704b4b9..ce8b98c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HDFSServiceCalculatedState.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HDFSServiceCalculatedState.java
@@ -64,7 +64,7 @@ public final class HDFSServiceCalculatedState extends DefaultServiceCalculatedSt
for (ServiceComponentHostResponse hostComponentResponse : hostComponentResponses ) {
try {
ComponentInfo componentInfo = ambariMetaInfo.getComponent(stackId.getStackName(),
- stackId.getStackVersion(), hostComponentResponse.getServiceName(),
+ stackId.getStackVersion(), hostComponentResponse.getServiceType(),
hostComponentResponse.getComponentName());
if (componentInfo.isMaster()) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HiveServiceCalculatedState.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HiveServiceCalculatedState.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HiveServiceCalculatedState.java
index 5e23f0b..440dd53 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HiveServiceCalculatedState.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HiveServiceCalculatedState.java
@@ -66,7 +66,7 @@ public final class HiveServiceCalculatedState extends DefaultServiceCalculatedSt
for (ServiceComponentHostResponse hostComponentResponse : hostComponentResponses ) {
try {
ComponentInfo componentInfo = ambariMetaInfo.getComponent(stackId.getStackName(),
- stackId.getStackVersion(), hostComponentResponse.getServiceName(),
+ stackId.getStackVersion(), hostComponentResponse.getServiceType(),
hostComponentResponse.getComponentName());
if (componentInfo.isMaster()) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/OozieServiceCalculatedState.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/OozieServiceCalculatedState.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/OozieServiceCalculatedState.java
index 6c5eab4..2d9356c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/OozieServiceCalculatedState.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/OozieServiceCalculatedState.java
@@ -61,7 +61,7 @@ public final class OozieServiceCalculatedState extends DefaultServiceCalculatedS
for (ServiceComponentHostResponse hostComponentResponse : hostComponentResponses ) {
try {
ComponentInfo componentInfo = ambariMetaInfo.getComponent(stackId.getStackName(),
- stackId.getStackVersion(), hostComponentResponse.getServiceName(),
+ stackId.getStackVersion(), hostComponentResponse.getServiceType(),
hostComponentResponse.getComponentName());
if (componentInfo.isMaster()) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/YARNServiceCalculatedState.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/YARNServiceCalculatedState.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/YARNServiceCalculatedState.java
index 2fd99e4..b7a14b5 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/YARNServiceCalculatedState.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/YARNServiceCalculatedState.java
@@ -63,7 +63,7 @@ public final class YARNServiceCalculatedState extends DefaultServiceCalculatedSt
for (ServiceComponentHostResponse hostComponentResponse : hostComponentResponses ) {
try {
ComponentInfo componentInfo = ambariMetaInfo.getComponent(stackId.getStackName(),
- stackId.getStackVersion(), hostComponentResponse.getServiceName(),
+ stackId.getStackVersion(), hostComponentResponse.getServiceType(),
hostComponentResponse.getComponentName());
if (componentInfo.isMaster()) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertMaintenanceModeListener.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertMaintenanceModeListener.java b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertMaintenanceModeListener.java
index f73d7c9..602d0b8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertMaintenanceModeListener.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertMaintenanceModeListener.java
@@ -139,7 +139,7 @@ public class AlertMaintenanceModeListener {
} else if( null != serviceComponentHost ){
// component level maintenance
String hostName = serviceComponentHost.getHostName();
- String serviceName = serviceComponentHost.getServiceName();
+ String serviceName = serviceComponentHost.getServiceType();
String componentName = serviceComponentHost.getServiceComponentName();
// match on all 3 for a service component
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertServiceStateListener.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertServiceStateListener.java b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertServiceStateListener.java
index 053fb54..41ae4e8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertServiceStateListener.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertServiceStateListener.java
@@ -154,7 +154,7 @@ public class AlertServiceStateListener {
// which hosts are invalidated; do that in another impl
try {
Set<AlertDefinition> alertDefinitions = m_metaInfoProvider.get().getAlertDefinitions(
- stackName, stackVersion, serviceName);
+ stackName, stackVersion, event.getServiceType());
for (AlertDefinition definition : alertDefinitions) {
AlertDefinitionEntity entity = m_alertDefinitionFactory.coerce(
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java
index 4846eb1..b4a1529 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java
@@ -259,11 +259,10 @@ public class HostVersionOutOfSyncListener {
// We perform check per-stack version, because component may be not versionAdvertised in current
// stack, but become versionAdvertised in some future (installed, but not yet upgraded to) stack
boolean hasChangedComponentsWithVersions = false;
- String serviceName = event.getServiceName();
for (ServiceComponent comp : affectedHosts.get(hostName)) {
String componentName = comp.getName();
ComponentInfo component = ami.get().getComponent(repositoryVersion.getStackName(),
- repositoryVersion.getStackVersion(), serviceName, componentName);
+ repositoryVersion.getStackVersion(), comp.getServiceType(), componentName);
if (component.isVersionAdvertised()) {
hasChangedComponentsWithVersions = true;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
index e5298dc..df038b4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
@@ -121,7 +121,7 @@ public class StackVersionListener {
AmbariMetaInfo ambariMetaInfo = ambariMetaInfoProvider.get();
ComponentInfo componentInfo = ambariMetaInfo.getComponent(desiredStackId.getStackName(),
- desiredStackId.getStackVersion(), sch.getServiceName(), sch.getServiceComponentName());
+ desiredStackId.getStackVersion(), sch.getServiceType(), sch.getServiceComponentName());
// not advertising a version, do nothing
if (!componentInfo.isVersionAdvertised()) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/mpack/MpackManager.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/mpack/MpackManager.java b/ambari-server/src/main/java/org/apache/ambari/server/mpack/MpackManager.java
index 0fcc285..1036926 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/mpack/MpackManager.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/mpack/MpackManager.java
@@ -117,7 +117,7 @@ public class MpackManager {
}
}
}
- } catch (IOException e) {
+ } catch (NullPointerException|IOException e) {
e.printStackTrace();
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
index d6876d9..4f11ab0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
@@ -378,7 +378,7 @@ public class FinalizeUpgradeAction extends AbstractUpgradeServerAction {
for (ServiceComponent serviceComponent : service.getServiceComponents().values()) {
for (ServiceComponentHost serviceComponentHost : serviceComponent.getServiceComponentHosts().values()) {
ComponentInfo componentInfo = ambariMetaInfo.getComponent(targetStackId.getStackName(),
- targetStackId.getStackVersion(), service.getName(), serviceComponent.getName());
+ targetStackId.getStackVersion(), service.getServiceType(), serviceComponent.getName());
if (!componentInfo.isVersionAdvertised()) {
continue;
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
index e89f3dc..d729cb8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
@@ -943,7 +943,7 @@ public class ConfigHelper {
// below, no attempt will be made to remove properties that exist in excluded types.
Service service = cluster.getService(serviceName);
- return getServiceProperties(service.getDesiredStackId(), serviceName, false);
+ return getServiceProperties(service.getDesiredStackId(), service.getServiceType(), false);
}
/**
@@ -955,15 +955,15 @@ public class ConfigHelper {
* PropertyInfos will be returned.
*
* @param stackId a StackId declaring the relevant stack
- * @param serviceName a String containing the requested service's name
+ * @param stackServiceName a String containing the requested service's name
* @param removeExcluded a boolean value indicating whether to remove properties from excluded
* configuration types (<code>true</code>) or return the complete set of properties regardless of exclusions (<code>false</code>)
* @return a Set of PropertyInfo objects for the requested service
* @throws AmbariException if the requested stack or the requested service is not found
*/
- public Set<PropertyInfo> getServiceProperties(StackId stackId, String serviceName, boolean removeExcluded)
+ public Set<PropertyInfo> getServiceProperties(StackId stackId, String stackServiceName, boolean removeExcluded)
throws AmbariException {
- ServiceInfo service = ambariMetaInfo.getService(stackId.getStackName(), stackId.getStackVersion(), serviceName);
+ ServiceInfo service = ambariMetaInfo.getService(stackId.getStackName(), stackId.getStackVersion(), stackServiceName);
Set<PropertyInfo> properties = new HashSet<>(service.getProperties());
if (removeExcluded) {
@@ -1319,7 +1319,7 @@ public class ConfigHelper {
StackInfo stackInfo = ambariMetaInfo.getStack(stackId);
ServiceInfo serviceInfo = ambariMetaInfo.getService(stackId.getStackName(),
- stackId.getStackVersion(), sch.getServiceName());
+ stackId.getStackVersion(), sch.getServiceType());
ComponentInfo componentInfo = serviceInfo.getComponentByName(sch.getServiceComponentName());
// Configs are considered stale when:
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
index df6437e..b4b4ea1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
@@ -138,7 +138,7 @@ public class ServiceComponentImpl implements ServiceComponent {
StackId stackId = service.getDesiredStackId();
try {
ComponentInfo compInfo = ambariMetaInfo.getComponent(stackId.getStackName(),
- stackId.getStackVersion(), service.getName(), componentName);
+ stackId.getStackVersion(), service.getServiceType(), componentName);
isClientComponent = compInfo.isClient();
isMasterComponent = compInfo.isMaster();
isVersionAdvertised = compInfo.isVersionAdvertised();
@@ -147,7 +147,7 @@ public class ServiceComponentImpl implements ServiceComponent {
throw new RuntimeException("Trying to create a ServiceComponent"
+ " not recognized in stack info"
+ ", clusterName=" + service.getCluster().getClusterName()
- + ", serviceName=" + service.getName()
+ + ", serviceName=" + service.getServiceType()
+ ", componentName=" + componentName
+ ", stackInfo=" + stackId.getStackId());
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
index 70344b0..167e4ca 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
@@ -201,7 +201,7 @@ public class ServiceImpl implements Service {
StackId stackId = getDesiredStackId();
ServiceInfo sInfo = ambariMetaInfo.getService(stackId.getStackName(),
- stackId.getStackVersion(), getName());
+ stackId.getStackVersion(), getServiceType());
isClientOnlyService = sInfo.isClientOnlyService();
isCredentialStoreSupported = sInfo.isCredentialStoreSupported();
isCredentialStoreRequired = sInfo.isCredentialStoreRequired();
@@ -279,6 +279,7 @@ public class ServiceImpl implements Service {
throw new AmbariException("Cannot add duplicate ServiceComponent"
+ ", clusterName=" + cluster.getClusterName()
+ ", clusterId=" + cluster.getClusterId()
+ + ", serviceType=" + getServiceType()
+ ", serviceName=" + getName()
+ ", serviceComponentName=" + component.getName());
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
----------------------------------------------------------------------
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 ebc82ee..510072a 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
@@ -877,7 +877,7 @@ public class UpgradeHelper {
boolean versionAdvertised = false;
try {
ComponentInfo ci = m_ambariMetaInfoProvider.get().getComponent(targetStack.getStackName(),
- targetStack.getStackVersion(), serviceComponent.getServiceName(),
+ targetStack.getStackVersion(), serviceComponent.getServiceType(),
serviceComponent.getName());
versionAdvertised = ci.isVersionAdvertised();
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertDefinitionHash.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertDefinitionHash.java b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertDefinitionHash.java
index 15f7048..025015a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertDefinitionHash.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertDefinitionHash.java
@@ -399,7 +399,7 @@ public class AlertDefinitionHash {
// if a host has a matching service/component, invalidate it
for (ServiceComponentHost component : hostComponents) {
- String serviceName = component.getServiceName();
+ String serviceName = component.getServiceType();
String componentName = component.getServiceComponentName();
if (serviceName.equals(definitionServiceName)
&& componentName.equals(definitionComponentName)) {
@@ -645,7 +645,7 @@ public class AlertDefinitionHash {
List<ServiceComponentHost> serviceComponents = cluster.getServiceComponentHosts(hostName);
if (null == serviceComponents || !serviceComponents.isEmpty()) {
for (ServiceComponentHost serviceComponent : serviceComponents) {
- String serviceName = serviceComponent.getServiceName();
+ String serviceName = serviceComponent.getServiceType();
String componentName = serviceComponent.getServiceComponentName();
// add all alerts for this service/component pair
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
index fcc07b6..1e4d81f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
@@ -437,7 +437,7 @@ public class ClusterImpl implements Cluster {
StackId stackId = new StackId(stackEntity);
try {
if (ambariMetaInfo.getService(stackId.getStackName(),
- stackId.getStackVersion(), serviceEntity.getServiceName()) != null) {
+ stackId.getStackVersion(), serviceEntity.getServiceType()) != null) {
services.put(serviceEntity.getServiceName(),
serviceFactory.createExisting(this, getServiceGroup(serviceEntity.getServiceGroupId()), serviceEntity));
stackId = getService(serviceEntity.getServiceName()).getDesiredStackId();
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
index 13ceeb9..4285ba9 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
@@ -1194,7 +1194,7 @@ public class HostImpl implements Host {
Service s = cluster.getService(hostComponentState.getServiceId());
ComponentInfo componentInfo = ambariMetaInfo.getComponent(
desiredRepositoryVersion.getStackName(), desiredRepositoryVersion.getStackVersion(),
- s.getName(), hostComponentState.getComponentName());
+ s.getServiceType(), hostComponentState.getComponentName());
// skip components which don't advertise a version
if (!componentInfo.isVersionAdvertised()) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/HostOrderGrouping.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/HostOrderGrouping.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/HostOrderGrouping.java
index acf0639..3f6ad60 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/HostOrderGrouping.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/HostOrderGrouping.java
@@ -342,7 +342,7 @@ public class HostOrderGrouping extends Grouping {
try {
ComponentInfo component = upgradeContext.getAmbariMetaInfo().getComponent(
targetStack.getStackName(), targetStack.getStackVersion(),
- sch.getServiceName(), sch.getServiceComponentName());
+ sch.getServiceType(), sch.getServiceComponentName());
return component.isVersionAdvertised();
} catch (AmbariException e) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServiceCheckGrouping.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServiceCheckGrouping.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServiceCheckGrouping.java
index 9c47e5d..0587de4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServiceCheckGrouping.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServiceCheckGrouping.java
@@ -182,7 +182,7 @@ public class ServiceCheckGrouping extends Grouping {
// Services that only have clients such as Pig can still have service check scripts.
StackId stackId = svc.getDesiredStackId();
try {
- ServiceInfo si = m_metaInfo.getService(stackId.getStackName(), stackId.getStackVersion(), service);
+ ServiceInfo si = m_metaInfo.getService(stackId.getStackName(), stackId.getStackVersion(), svc.getServiceType());
CommandScriptDefinition script = si.getCommandScript();
if (null != script && null != script.getScript() && !script.getScript().isEmpty()) {
ctx.setServiceDisplay(service, si.getDisplayName());
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
index 6190a03..0b9811e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
@@ -1198,7 +1198,7 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
try {
StackId stackVersion = serviceComponent.getDesiredStackId();
ComponentInfo compInfo = ambariMetaInfo.getComponent(stackVersion.getStackName(),
- stackVersion.getStackVersion(), serviceName, serviceComponentName);
+ stackVersion.getStackVersion(), service.getServiceType(), serviceComponentName);
displayName = compInfo.getDisplayName();
} catch (AmbariException e) {
displayName = serviceComponentName;
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostSummary.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostSummary.java b/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostSummary.java
index 7edabc6..a9b8a2c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostSummary.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostSummary.java
@@ -69,7 +69,6 @@ public class ServiceComponentHostSummary {
for (HostComponentStateEntity hostComponentStateEntity : allHostComponents) {
ClusterServiceEntity serviceEntity = hostComponentStateEntity.getServiceComponentDesiredStateEntity().getClusterServiceEntity();
- String serviceName = serviceEntity.getServiceName();
String serviceType = serviceEntity.getServiceType();
ComponentInfo compInfo = ambariMetaInfo.getComponent(stackName, stackVersion, serviceType,
hostComponentStateEntity.getComponentName());