You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2017/10/09 04:40:12 UTC
[1/3] ambari git commit: AMBARI-22164: Update services API to user
service_name, service_type instead of service_display_name,
service_name (jluniya)
Repository: ambari
Updated Branches:
refs/heads/branch-feature-AMBARI-14714 53333dad3 -> ba1ec6ddb
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/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 8548cf3..56d352e 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
@@ -1157,9 +1157,9 @@ public class HostImpl implements Host {
HostEntity hostEntity = getHostEntity();
for (HostComponentStateEntity componentState : hostEntity.getHostComponentStateEntities()) {
- String serviceDisplayName = componentState.getServiceComponentDesiredStateEntity().getClusterServiceEntity().getServiceName();
- ComponentInfo component = ambariMetaInfo.getComponent(stackId.getStackName(), stackId.getStackVersion(),
- serviceDisplayName, componentState.getComponentName());
+ String serviceType = componentState.getServiceComponentDesiredStateEntity().getClusterServiceEntity().getServiceType();
+ ComponentInfo component = ambariMetaInfo.getComponent(
+ stackId.getStackName(), stackId.getStackVersion(), serviceType, componentState.getComponentName());
if (component.isVersionAdvertised()) {
return true;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/state/repository/VersionDefinitionXml.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/repository/VersionDefinitionXml.java b/ambari-server/src/main/java/org/apache/ambari/server/state/repository/VersionDefinitionXml.java
index ba035ab..a19238e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/repository/VersionDefinitionXml.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/repository/VersionDefinitionXml.java
@@ -302,7 +302,7 @@ public class VersionDefinitionXml {
continue;
}
- ServiceVersionSummary summary = new ServiceVersionSummary(service.getServiceDisplayName());
+ ServiceVersionSummary summary = new ServiceVersionSummary(service.getDisplayName());
summaries.put(service.getName(), summary);
String serviceVersion = service.getDesiredRepositoryVersion().getVersion();
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/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 54cbc3d..2697b40 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
@@ -812,7 +812,7 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
// publish the service component installed event
ServiceComponentInstalledEvent event = new ServiceComponentInstalledEvent(getClusterId(),
- stackId.getStackName(), stackId.getStackVersion(), getServiceName(), getServiceDisplayName(),
+ stackId.getStackName(), stackId.getStackVersion(), getServiceName(), getServiceType(),
getServiceGroupName(), getServiceComponentName(), getHostName(), isRecoveryEnabled());
eventPublisher.publish(event);
@@ -1068,8 +1068,8 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
}
@Override
- public String getServiceDisplayName() {
- return serviceComponent.getServiceDisplayName();
+ public String getServiceType() {
+ return serviceComponent.getServiceType();
}
@Override
@@ -1175,7 +1175,7 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
String clusterName = serviceComponent.getClusterName();
Long clusterId = serviceComponent.getClusterId();
- String serviceName = serviceComponent.getServiceDisplayName();
+ String serviceName = serviceComponent.getServiceName();
Cluster cluster = null;
Service service = null;
try {
@@ -1211,7 +1211,7 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
}
ServiceComponentHostResponse r = new ServiceComponentHostResponse(clusterId, clusterName, service.getServiceGroupId(),
- service.getServiceGroupName(), service.getServiceId(), service.getName(), service.getServiceDisplayName(),
+ service.getServiceGroupName(), service.getServiceId(), service.getName(), service.getServiceType(),
hostComponentId, serviceComponentName, displayName, hostName, publicHostName, state, getVersion(),
desiredState, desiredStackId, desiredRepositoryVersion, componentAdminState);
@@ -1307,14 +1307,14 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
String stackVersion = stackId.getStackVersion();
String stackName = stackId.getStackName();
String serviceName = getServiceName();
- String serviceDisplayName = getServiceDisplayName();
+ String serviceType = getServiceType();
String serviceGroupName = getServiceGroupName();
String componentName = getServiceComponentName();
String hostName = getHostName();
boolean recoveryEnabled = isRecoveryEnabled();
ServiceComponentUninstalledEvent event = new ServiceComponentUninstalledEvent(
- clusterId, stackName, stackVersion, serviceName, serviceDisplayName, serviceGroupName, componentName,
+ clusterId, stackName, stackVersion, serviceName, serviceType, serviceGroupName, componentName,
hostName, recoveryEnabled);
eventPublisher.publish(event);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/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 4615ff6..7edabc6 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
@@ -24,6 +24,7 @@ import java.util.HashSet;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
+import org.apache.ambari.server.orm.entities.ClusterServiceEntity;
import org.apache.ambari.server.orm.entities.HostComponentStateEntity;
import org.apache.ambari.server.orm.entities.HostEntity;
import org.apache.ambari.server.orm.entities.RepositoryVersionEntity;
@@ -67,9 +68,10 @@ public class ServiceComponentHostSummary {
String stackVersion = repositoryVersion.getStackVersion();
for (HostComponentStateEntity hostComponentStateEntity : allHostComponents) {
- String serviceDisplayName = hostComponentStateEntity.getServiceComponentDesiredStateEntity().
- getClusterServiceEntity().getServiceDisplayName();
- ComponentInfo compInfo = ambariMetaInfo.getComponent(stackName, stackVersion, serviceDisplayName,
+ ClusterServiceEntity serviceEntity = hostComponentStateEntity.getServiceComponentDesiredStateEntity().getClusterServiceEntity();
+ String serviceName = serviceEntity.getServiceName();
+ String serviceType = serviceEntity.getServiceType();
+ ComponentInfo compInfo = ambariMetaInfo.getComponent(stackName, stackVersion, serviceType,
hostComponentStateEntity.getComponentName());
if (!compInfo.isVersionAdvertised()) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
index 51bd31f..b8c0a42 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
@@ -162,7 +162,7 @@ CREATE TABLE servicegroups (
CREATE TABLE clusterservices (
id BIGINT NOT NULL,
service_name VARCHAR(255) NOT NULL,
- service_display_name VARCHAR(255) NOT NULL,
+ service_type VARCHAR(255) NOT NULL,
cluster_id BIGINT NOT NULL,
service_group_id BIGINT NOT NULL,
service_enabled INTEGER NOT NULL,
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
index 2fa9f56..c56e486 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
@@ -181,7 +181,7 @@ CREATE TABLE servicegroups (
CREATE TABLE clusterservices (
id BIGINT NOT NULL,
service_name VARCHAR(255) NOT NULL,
- service_display_name VARCHAR(255) NOT NULL,
+ service_type VARCHAR(255) NOT NULL,
cluster_id BIGINT NOT NULL,
service_group_id BIGINT NOT NULL,
service_enabled INTEGER NOT NULL,
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
index 9443266..8917d48 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
@@ -163,7 +163,7 @@ CREATE TABLE servicegroups (
CREATE TABLE clusterservices (
id NUMBER(19) NOT NULL,
service_name VARCHAR2(255) NOT NULL,
- service_display_name VARCHAR(255) NOT NULL,
+ service_type VARCHAR(255) NOT NULL,
cluster_id NUMBER(19) NOT NULL,
service_group_id NUMBER(19) NOT NULL,
service_enabled NUMBER(10) NOT NULL,
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
index eda83fa..f48bcd6 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
@@ -162,7 +162,7 @@ CREATE TABLE servicegroups (
CREATE TABLE clusterservices (
id BIGINT NOT NULL,
service_name VARCHAR(255) NOT NULL,
- service_display_name VARCHAR(255) NOT NULL,
+ service_type VARCHAR(255) NOT NULL,
cluster_id BIGINT NOT NULL,
service_group_id BIGINT NOT NULL,
service_enabled INTEGER NOT NULL,
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
index 3da609e..e7c5c72 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
@@ -161,7 +161,7 @@ CREATE TABLE servicegroups (
CREATE TABLE clusterservices (
id NUMERIC(19) NOT NULL,
service_name VARCHAR(255) NOT NULL,
- service_display_name VARCHAR(255) NOT NULL,
+ service_type VARCHAR(255) NOT NULL,
cluster_id NUMERIC(19) NOT NULL,
service_group_id NUMERIC(19) NOT NULL,
service_enabled INTEGER NOT NULL,
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
index 0d09854..f87af4c 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
@@ -175,7 +175,7 @@ CREATE TABLE servicegroups (
CREATE TABLE clusterservices (
id BIGINT NOT NULL,
service_name VARCHAR(255) NOT NULL,
- service_display_name VARCHAR(255) NOT NULL,
+ service_type VARCHAR(255) NOT NULL,
cluster_id BIGINT NOT NULL,
service_group_id BIGINT NOT NULL,
service_enabled INT NOT NULL,
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/resources/key_properties.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/key_properties.json b/ambari-server/src/main/resources/key_properties.json
index 17d7cc4..73eb039 100644
--- a/ambari-server/src/main/resources/key_properties.json
+++ b/ambari-server/src/main/resources/key_properties.json
@@ -10,7 +10,7 @@
"Cluster": "HostRoles/cluster_name",
"ServiceGroup": "HostRoles/service_group_name",
"Host": "HostRoles/host_name",
- "Service": "HostRoles/service_display_name",
+ "Service": "HostRoles/service_name",
"HostComponent": "HostRoles/component_name",
"Component": "HostRoles/component_name"
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/resources/properties.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/properties.json b/ambari-server/src/main/resources/properties.json
index 2f8bb7c..3e73217 100644
--- a/ambari-server/src/main/resources/properties.json
+++ b/ambari-server/src/main/resources/properties.json
@@ -61,7 +61,7 @@
"HostRoles/maintenance_state",
"HostRoles/service_id",
"HostRoles/service_name",
- "HostRoles/service_display_name",
+ "HostRoles/service_type",
"HostRoles/upgrade_state",
"_"
],
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-web/app/controllers/global/update_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/update_controller.js b/ambari-web/app/controllers/global/update_controller.js
index ace608f..0758686 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -457,7 +457,7 @@ App.UpdateController = Em.Controller.extend({
realUrl = '/components/?' + flumeHandlerParam + atsHandlerParam + haComponents +
'ServiceComponentInfo/category=MASTER&fields=' +
'ServiceComponentInfo/service_name,' +
- 'ServiceComponentInfo/service_display_name,' +
+ 'ServiceComponentInfo/service_type,' +
'host_components/HostRoles/display_name,' +
'host_components/HostRoles/host_name,' +
'host_components/HostRoles/public_host_name,' +
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-web/app/controllers/main/admin/kerberos/step3_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step3_controller.js b/ambari-web/app/controllers/main/admin/kerberos/step3_controller.js
index ee6153b..15be4f9 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step3_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step3_controller.js
@@ -45,7 +45,7 @@ App.KerberosWizardStep3Controller = App.KerberosProgressPageController.extend({
data: {
context: Em.I18n.t('requestInfo.kerberosService'),
ServiceInfo: {"state": "INSTALLED"},
- urlParams: "ServiceInfo/state=INSTALLED&ServiceInfo/service_display_name=KERBEROS"
+ urlParams: "ServiceInfo/state=INSTALLED&ServiceInfo/service_name=KERBEROS"
},
success: 'startPolling',
error: 'onTaskError'
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-web/app/controllers/main/service/add_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/add_controller.js b/ambari-web/app/controllers/main/service/add_controller.js
index 0c54e30..c11bcf2 100644
--- a/ambari-web/app/controllers/main/service/add_controller.js
+++ b/ambari-web/app/controllers/main/service/add_controller.js
@@ -428,7 +428,7 @@ App.AddServiceController = App.WizardController.extend(App.AddSecurityConfigs, {
return {
"context": Em.I18n.t('requestInfo.installServices'),
"ServiceInfo": {"state": "INSTALLED"},
- "urlParams": "ServiceInfo/service_display_name.in(" + selectedServices.join(',') + ")"
+ "urlParams": "ServiceInfo/service_name.in(" + selectedServices.join(',') + ")"
};
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index d21bcc5..dfbd58f 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1034,8 +1034,8 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
selectedStack = App.Stack.find().findProperty('isSelected', true);
}
return this.get('selectedServices').map(service => selectedStack ?
- {"ServiceInfo": { "service_name": service.get('serviceName'), "service_display_name": service.get('serviceName'), "service_group_name": App.get('defaultServiceGroupName'), "desired_repository_version_id": selectedStack.get('versionInfoId') }} :
- {"ServiceInfo": { "service_name": service.get('serviceName'), "service_display_name": service.get('serviceName'), "service_group_name": App.get('defaultServiceGroupName'), }});
+ {"ServiceInfo": { "service_name": service.get('serviceName'), "service_type": service.get('serviceName'), "service_group_name": App.get('defaultServiceGroupName'), "desired_repository_version_id": selectedStack.get('versionInfoId') }} :
+ {"ServiceInfo": { "service_name": service.get('serviceName'), "service_type": service.get('serviceName'), "service_group_name": App.get('defaultServiceGroupName'), }});
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-web/app/controllers/wizard/step9_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step9_controller.js b/ambari-web/app/controllers/wizard/step9_controller.js
index e096c4f..9f27f65 100644
--- a/ambari-web/app/controllers/wizard/step9_controller.js
+++ b/ambari-web/app/controllers/wizard/step9_controller.js
@@ -492,7 +492,7 @@ App.WizardStep9Controller = Em.Controller.extend(App.ReloadPopupMixin, {
data = {
"context": Em.I18n.t("requestInfo.startAddedServices"),
"ServiceInfo": { "state": "STARTED" },
- "urlParams": "ServiceInfo/state=INSTALLED&ServiceInfo/service_display_name.in(" + servicesList.join(",") + ")¶ms/run_smoke_test=true¶ms/reconfigure_client=false"
+ "urlParams": "ServiceInfo/state=INSTALLED&ServiceInfo/service_name.in(" + servicesList.join(",") + ")¶ms/run_smoke_test=true¶ms/reconfigure_client=false"
};
break;
default:
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-web/app/mappers/service_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/service_mapper.js b/ambari-web/app/mappers/service_mapper.js
index 38d2724..24130dd 100644
--- a/ambari-web/app/mappers/service_mapper.js
+++ b/ambari-web/app/mappers/service_mapper.js
@@ -21,8 +21,8 @@ var misc = require('utils/misc');
App.serviceMapper = App.QuickDataMapper.create({
model: App.Service,
config: {
- id: 'ServiceInfo.service_display_name',
- service_name: 'ServiceInfo.service_display_name',
+ id: 'ServiceInfo.service_name',
+ service_name: 'ServiceInfo.service_name',
work_status: 'ServiceInfo.state',
desired_repository_version_id: 'ServiceInfo.desired_repository_version_id'
},
@@ -33,15 +33,15 @@ App.serviceMapper = App.QuickDataMapper.create({
var self = this;
var passiveStateMap = this.get('passiveStateMap');
json.items.forEach(function (service) {
- var cachedService = App.cache['services'].findProperty('ServiceInfo.service_display_name', service.ServiceInfo.service_display_name);
+ var cachedService = App.cache['services'].findProperty('ServiceInfo.service_name', service.ServiceInfo.service_name);
if (cachedService) {
// restore service workStatus
- App.Service.find(cachedService.ServiceInfo.service_display_name).set('workStatus', service.ServiceInfo.state);
+ App.Service.find(cachedService.ServiceInfo.service_name).set('workStatus', service.ServiceInfo.state);
cachedService.ServiceInfo.state = service.ServiceInfo.state;
} else {
var serviceData = {
ServiceInfo: {
- service_display_name: service.ServiceInfo.service_display_name,
+ service_name: service.ServiceInfo.service_name,
state: service.ServiceInfo.state,
desired_repository_version_id: service.ServiceInfo.desired_repository_version_id
},
@@ -50,7 +50,7 @@ App.serviceMapper = App.QuickDataMapper.create({
};
App.cache['services'].push(serviceData);
}
- passiveStateMap[service.ServiceInfo.service_display_name] = service.ServiceInfo.maintenance_state;
+ passiveStateMap[service.ServiceInfo.service_name] = service.ServiceInfo.maintenance_state;
});
if (!this.get('initialAppLoad')) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-web/app/mappers/service_metrics_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/service_metrics_mapper.js b/ambari-web/app/mappers/service_metrics_mapper.js
index 87cd2a0..9f79905 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/ambari-web/app/mappers/service_metrics_mapper.js
@@ -25,8 +25,8 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
model: App.Service,
config: {
- id: 'ServiceInfo.service_display_name',
- service_name: 'ServiceInfo.service_display_name',
+ id: 'ServiceInfo.service_name',
+ service_name: 'ServiceInfo.service_name',
work_status: 'ServiceInfo.state',
passive_state: 'ServiceInfo.passive_state',
$rand: Math.random(),
@@ -195,7 +195,7 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
json.items.forEach(function (component) {
var serviceName = component.ServiceComponentInfo.service_name;
- var service = services.findProperty('ServiceInfo.service_display_name', serviceName);
+ var service = services.findProperty('ServiceInfo.service_name', serviceName);
if (service) {
service.components.push(component);
}
@@ -224,7 +224,7 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
if (hostComponent.get('isLoaded')) {
this.deleteRecord(hostComponent);
}
- var serviceCache = services.findProperty('ServiceInfo.service_display_name', hostComponent.get('service.serviceName'));
+ var serviceCache = services.findProperty('ServiceInfo.service_name', hostComponent.get('service.serviceName'));
if (serviceCache) {
serviceCache.host_components = serviceCache.host_components.without(hostComponent.get('id'));
}
@@ -236,7 +236,7 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
//parse service metrics from components
services.forEach(function (item) {
- hostComponents.filterProperty('service_id', item.ServiceInfo.service_display_name).mapProperty('id').forEach(function (hostComponent) {
+ hostComponents.filterProperty('service_id', item.ServiceInfo.service_name).mapProperty('id').forEach(function (hostComponent) {
if (!item.host_components.contains(hostComponent)) {
item.host_components.push(hostComponent);
}
@@ -245,7 +245,7 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
var extendedModelInfo = this.mapExtendedModel(item);
if (extendedModelInfo) {
- extendedModelInfo.passive_state = App.Service.find(item.ServiceInfo.service_display_name).get('passiveState');
+ extendedModelInfo.passive_state = App.Service.find(item.ServiceInfo.service_name).get('passiveState');
result.push(extendedModelInfo);
}
}, this);
@@ -288,33 +288,33 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
*/
mapExtendedModel: function(item) {
var finalJson = false;
- if (item && item.ServiceInfo && item.ServiceInfo.service_display_name == "HDFS") {
+ if (item && item.ServiceInfo && item.ServiceInfo.service_name == "HDFS") {
finalJson = this.hdfsMapper(item);
finalJson.rand = Math.random();
App.store.safeLoad(App.HDFSService, finalJson);
- } else if (item && item.ServiceInfo && item.ServiceInfo.service_display_name == "HBASE") {
+ } else if (item && item.ServiceInfo && item.ServiceInfo.service_name == "HBASE") {
finalJson = this.hbaseMapper(item);
finalJson.rand = Math.random();
App.store.safeLoad(App.HBaseService, finalJson);
- } else if (item && item.ServiceInfo && item.ServiceInfo.service_display_name == "FLUME") {
+ } else if (item && item.ServiceInfo && item.ServiceInfo.service_name == "FLUME") {
finalJson = this.flumeMapper(item);
finalJson.rand = Math.random();
App.store.safeLoadMany(App.FlumeAgent, finalJson.agentJsons);
App.store.safeLoad(App.FlumeService, finalJson);
- } else if (item && item.ServiceInfo && item.ServiceInfo.service_display_name == "YARN") {
+ } else if (item && item.ServiceInfo && item.ServiceInfo.service_name == "YARN") {
finalJson = this.yarnMapper(item);
finalJson.rand = Math.random();
App.store.safeLoad(App.YARNService, finalJson);
- } else if (item && item.ServiceInfo && item.ServiceInfo.service_display_name == "MAPREDUCE2") {
+ } else if (item && item.ServiceInfo && item.ServiceInfo.service_name == "MAPREDUCE2") {
finalJson = this.mapreduce2Mapper(item);
finalJson.rand = Math.random();
App.store.safeLoad(App.MapReduce2Service, finalJson);
- } else if (item && item.ServiceInfo && item.ServiceInfo.service_display_name == "STORM") {
+ } else if (item && item.ServiceInfo && item.ServiceInfo.service_name == "STORM") {
finalJson = this.stormMapper(item);
finalJson.rand = Math.random();
this.mapQuickLinks(finalJson, item);
App.store.safeLoad(App.StormService, finalJson);
- } else if (item && item.ServiceInfo && item.ServiceInfo.service_display_name == "RANGER") {
+ } else if (item && item.ServiceInfo && item.ServiceInfo.service_name == "RANGER") {
finalJson = this.rangerMapper(item);
finalJson.rand = Math.random();
App.store.safeLoad(App.RangerService, finalJson);
@@ -339,13 +339,13 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
// set tooltip for client-only services
var clientOnlyServiceNames = App.get('services.clientOnly');
clientOnlyServiceNames.forEach(function (serviceName) {
- var service = services.findProperty('ServiceInfo.service_display_name', serviceName);
+ var service = services.findProperty('ServiceInfo.service_name', serviceName);
if (service) {
service.tool_tip_content = Em.I18n.t('services.service.summary.clientOnlyService.ToolTip');
}
});
hostComponents.forEach(function (hostComponent) {
- var service = services.findProperty('ServiceInfo.service_display_name', hostComponent.service_id);
+ var service = services.findProperty('ServiceInfo.service_name', hostComponent.service_id);
if (hostComponent) {
// set advanced nameNode display name for HA, Active NameNode or Standby NameNode
// this is useful on three places: 1) HDFS health status hover tooltip, 2) HDFS service summary 3) NameNode component on host detail page
@@ -411,8 +411,8 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
AMBARI_METRICS: [37],
LOGSEARCH: [38]
};
- if (quickLinks[item.ServiceInfo.service_display_name])
- finalJson.quick_links = quickLinks[item.ServiceInfo.service_display_name];
+ if (quickLinks[item.ServiceInfo.service_name])
+ finalJson.quick_links = quickLinks[item.ServiceInfo.service_name];
},
hdfsMapper: function (item) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-web/app/mixins/common/configs/configs_saver.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/configs/configs_saver.js b/ambari-web/app/mixins/common/configs/configs_saver.js
index 19a4950..6b69ca1 100644
--- a/ambari-web/app/mixins/common/configs/configs_saver.js
+++ b/ambari-web/app/mixins/common/configs/configs_saver.js
@@ -750,7 +750,7 @@ App.ConfigsSaverMixin = Em.Mixin.create({
};
if (this.get('content.serviceName') === 'HDFS') {
- options.urlParams += '&ServiceComponentInfo/service_display_name.in(HDFS)'
+ options.urlParams += '&ServiceComponentInfo/service_name.in(HDFS)'
}
} else {
options = {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-web/app/mixins/wizard/wizardProgressPageController.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/wizard/wizardProgressPageController.js b/ambari-web/app/mixins/wizard/wizardProgressPageController.js
index 7e3aa1f..3dcde74 100644
--- a/ambari-web/app/mixins/wizard/wizardProgressPageController.js
+++ b/ambari-web/app/mixins/wizard/wizardProgressPageController.js
@@ -457,7 +457,7 @@ App.wizardProgressPageControllerMixin = Em.Mixin.create(App.InstallComponent, {
}).join(',');
}
data.context = "Stop required services";
- data.urlParams = "ServiceInfo/service_display_name.in(" + servicesList + ")";
+ data.urlParams = "ServiceInfo/service_name.in(" + servicesList + ")";
}
return App.ajax.send({
name: 'common.services.update',
@@ -497,7 +497,7 @@ App.wizardProgressPageControllerMixin = Em.Mixin.create(App.InstallComponent, {
}).join(',');
}
data.context = "Start required services";
- data.urlParams = "ServiceInfo/service_display_name.in(" + servicesList + ")";
+ data.urlParams = "ServiceInfo/service_name.in(" + servicesList + ")";
} else {
data.context = "Start all services";
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-web/app/utils/ajax/ajax.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js
index ad859f4..91748ed 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -1425,7 +1425,7 @@ var urls = {
'mock': ''
},
'common.create_component': {
- 'real': '/clusters/{clusterName}/servicegroups/{defaultServiceGroupName}/services?ServiceInfo/service_display_name={serviceName}',
+ 'real': '/clusters/{clusterName}/servicegroups/{defaultServiceGroupName}/services?ServiceInfo/service_name={serviceName}',
'mock': '',
'type': 'POST',
'format': function (data) {
@@ -2596,7 +2596,7 @@ var urls = {
'mock': ''
},
'components.get_category': {
- 'real': '/clusters/{clusterName}/components?fields=ServiceComponentInfo/component_name,ServiceComponentInfo/service_name,ServiceComponentInfo/service_display_name,ServiceComponentInfo/category,ServiceComponentInfo/recovery_enabled,ServiceComponentInfo/total_count&minimal_response=true',
+ 'real': '/clusters/{clusterName}/components?fields=ServiceComponentInfo/component_name,ServiceComponentInfo/service_name,ServiceComponentInfo/service_name,ServiceComponentInfo/category,ServiceComponentInfo/recovery_enabled,ServiceComponentInfo/total_count&minimal_response=true',
'mock': ''
},
'components.update': {
@@ -2666,7 +2666,7 @@ var urls = {
'mock': ''
},
'host_components.with_services_names': {
- 'real': '/clusters/{clusterName}/host_components?fields=component/ServiceComponentInfo/service_name,ServiceComponentInfo/service_display_name,HostRoles/host_name&minimal_response=true',
+ 'real': '/clusters/{clusterName}/host_components?fields=component/ServiceComponentInfo/service_name,ServiceComponentInfo/service_name,HostRoles/host_name&minimal_response=true',
'mock': ''
},
'components.get_installed': {
[3/3] ambari git commit: AMBARI-22164: Update services API to user
service_name, service_type instead of service_display_name,
service_name (jluniya)
Posted by jl...@apache.org.
AMBARI-22164: Update services API to user service_name, service_type instead of service_display_name, service_name (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ba1ec6dd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ba1ec6dd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ba1ec6dd
Branch: refs/heads/branch-feature-AMBARI-14714
Commit: ba1ec6ddb3fd8f5f33bbf6922eb58ca94866d1f7
Parents: 53333da
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Sun Oct 8 21:40:06 2017 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Sun Oct 8 21:40:06 2017 -0700
----------------------------------------------------------------------
.../ServiceComponentNotFoundException.java | 4 +-
.../ambari/server/ServiceNotFoundException.java | 4 +-
.../ambari/server/agent/HeartbeatMonitor.java | 10 +-
.../ambari/server/agent/HeartbeatProcessor.java | 6 +-
.../ambari/server/agent/StatusCommand.java | 10 +-
.../server/api/services/AmbariMetaInfo.java | 74 +++++-----
.../server/api/services/ComponentService.java | 30 ++--
.../server/api/services/ServiceService.java | 146 +++++++++----------
.../checks/SecondaryNamenodeDeletedCheck.java | 2 +-
.../AmbariManagementControllerImpl.java | 50 +++----
.../controller/ServiceComponentHostRequest.java | 16 +-
.../ServiceComponentHostResponse.java | 18 +--
.../controller/ServiceComponentRequest.java | 30 ++--
.../controller/ServiceComponentResponse.java | 18 +--
.../server/controller/ServiceRequest.java | 20 +--
.../server/controller/ServiceResponse.java | 20 +--
.../internal/ClientConfigResourceProvider.java | 2 +-
.../internal/ComponentResourceProvider.java | 38 ++---
.../internal/HostComponentResourceProvider.java | 28 ++--
.../internal/ServiceResourceProvider.java | 112 +++++++-------
.../controller/utilities/DatabaseChecker.java | 43 +++---
.../events/ServiceComponentInstalledEvent.java | 7 +-
.../ServiceComponentUninstalledEvent.java | 6 +-
.../ambari/server/events/ServiceEvent.java | 12 +-
.../server/events/ServiceInstalledEvent.java | 8 +-
.../server/events/ServiceRemovedEvent.java | 6 +-
.../upgrade/HostVersionOutOfSyncListener.java | 16 +-
.../orm/entities/ClusterServiceEntity.java | 16 +-
.../org/apache/ambari/server/state/Cluster.java | 2 +-
.../org/apache/ambari/server/state/Service.java | 4 +-
.../ambari/server/state/ServiceComponent.java | 2 +-
.../server/state/ServiceComponentHost.java | 6 +-
.../server/state/ServiceComponentImpl.java | 4 +-
.../ambari/server/state/ServiceFactory.java | 6 +-
.../apache/ambari/server/state/ServiceImpl.java | 51 ++++---
.../apache/ambari/server/state/StackInfo.java | 7 +-
.../server/state/cluster/ClusterImpl.java | 10 +-
.../ambari/server/state/host/HostImpl.java | 6 +-
.../state/repository/VersionDefinitionXml.java | 2 +-
.../svccomphost/ServiceComponentHostImpl.java | 14 +-
.../ServiceComponentHostSummary.java | 8 +-
.../main/resources/Ambari-DDL-Derby-CREATE.sql | 2 +-
.../main/resources/Ambari-DDL-MySQL-CREATE.sql | 2 +-
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 2 +-
.../resources/Ambari-DDL-Postgres-CREATE.sql | 2 +-
.../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 2 +-
.../resources/Ambari-DDL-SQLServer-CREATE.sql | 2 +-
.../src/main/resources/key_properties.json | 2 +-
.../src/main/resources/properties.json | 2 +-
.../app/controllers/global/update_controller.js | 2 +-
.../main/admin/kerberos/step3_controller.js | 2 +-
.../controllers/main/service/add_controller.js | 2 +-
.../app/controllers/wizard/step8_controller.js | 4 +-
.../app/controllers/wizard/step9_controller.js | 2 +-
ambari-web/app/mappers/service_mapper.js | 12 +-
.../app/mappers/service_metrics_mapper.js | 34 ++---
.../app/mixins/common/configs/configs_saver.js | 2 +-
.../wizard/wizardProgressPageController.js | 4 +-
ambari-web/app/utils/ajax/ajax.js | 6 +-
59 files changed, 486 insertions(+), 474 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/ServiceComponentNotFoundException.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/ServiceComponentNotFoundException.java b/ambari-server/src/main/java/org/apache/ambari/server/ServiceComponentNotFoundException.java
index 698f2ab..b570287 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/ServiceComponentNotFoundException.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/ServiceComponentNotFoundException.java
@@ -23,12 +23,12 @@ public class ServiceComponentNotFoundException
extends ObjectNotFoundException {
public ServiceComponentNotFoundException (String clusterName,
- String serviceName, String serviceDisplayName, String serviceGroupName, String serviceComponentName) {
+ String serviceName, String serviceType, String serviceGroupName, String serviceComponentName) {
super("ServiceComponent not found"
+ ", clusterName=" + clusterName
- + ", serviceDisplayName=" + serviceDisplayName
+ ", serviceGroupName=" + serviceGroupName
+ ", serviceName=" + serviceName
+ + ", serviceType=" + serviceType
+ ", serviceComponentName=" + serviceComponentName);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/ServiceNotFoundException.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/ServiceNotFoundException.java b/ambari-server/src/main/java/org/apache/ambari/server/ServiceNotFoundException.java
index 24cd7ae..d374b74 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/ServiceNotFoundException.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/ServiceNotFoundException.java
@@ -21,10 +21,10 @@ package org.apache.ambari.server;
@SuppressWarnings("serial")
public class ServiceNotFoundException extends ObjectNotFoundException {
- public ServiceNotFoundException(String clusterName, String serviceDisplayName) {
+ public ServiceNotFoundException(String clusterName, String serviceName) {
super("Service not found"
+ ", clusterName=" + clusterName
- + ", serviceDisplayName=" + serviceDisplayName);
+ + ", serviceName=" + serviceName);
}
public ServiceNotFoundException(String clusterName, Long serviceId) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
index a5b4d08..8d633d5 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
@@ -162,7 +162,7 @@ public class HeartbeatMonitor implements Runnable {
// mark all components that are not clients with unknown status
for (Cluster cluster : clusters.getClustersForHost(hostObj.getHostName())) {
for (ServiceComponentHost sch : cluster.getServiceComponentHosts(hostObj.getHostName())) {
- Service s = cluster.getService(sch.getServiceDisplayName());
+ Service s = cluster.getService(sch.getServiceName());
ServiceComponent sc = s.getServiceComponent(sch.getServiceComponentName());
if (!sc.isClientComponent() &&
!sch.getState().equals(State.INIT) &&
@@ -237,16 +237,16 @@ public class HeartbeatMonitor implements Runnable {
private StatusCommand createStatusCommand(String hostname, Cluster cluster,
ServiceComponentHost sch, Map<String, DesiredConfig> desiredConfigs) throws AmbariException {
String serviceName = sch.getServiceName();
- String serviceDisplayName = sch.getServiceDisplayName();
+ String serviceType = sch.getServiceType();
String componentName = sch.getServiceComponentName();
StackId stackId = sch.getDesiredStackId();
ServiceInfo serviceInfo = ambariMetaInfo.getService(stackId.getStackName(),
- stackId.getStackVersion(), serviceDisplayName);
+ stackId.getStackVersion(), serviceType);
ComponentInfo componentInfo = ambariMetaInfo.getComponent(
stackId.getStackName(), stackId.getStackVersion(),
- serviceDisplayName, componentName);
+ serviceType, componentName);
StackInfo stackInfo = ambariMetaInfo.getStack(stackId.getStackName(),
stackId.getStackVersion());
@@ -307,7 +307,7 @@ public class HeartbeatMonitor implements Runnable {
StatusCommand statusCmd = new StatusCommand();
statusCmd.setClusterName(cluster.getClusterName());
statusCmd.setServiceName(serviceName);
- statusCmd.setServiceDisplayName(serviceDisplayName);
+ statusCmd.setServiceType(serviceType);
statusCmd.setComponentName(componentName);
statusCmd.setConfigurations(configurations);
statusCmd.setConfigurationAttributes(configurationAttributes);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
index e99b0e0..3dae84b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
@@ -306,7 +306,7 @@ public class HeartbeatProcessor extends AbstractService{
ComponentInfo componentInfo =
ambariMetaInfo.getComponent(stackId.getStackName(),
- stackId.getStackVersion(), scHost.getServiceDisplayName(),
+ stackId.getStackVersion(), scHost.getServiceType(),
scHost.getServiceComponentName());
String status = scHost.getState().name();
@@ -509,8 +509,8 @@ public class HeartbeatProcessor extends AbstractService{
"RESTART".equals(report.getCustomCommand()))))
&& null != report.getConfigurationTags()
&& !report.getConfigurationTags().isEmpty()) {
- LOG.info("Updating applied config on serviceDisplayName " + scHost.getServiceDisplayName() +
- ", serviceName " + scHost.getServiceName() +
+ LOG.info("Updating applied config on serviceName " + scHost.getServiceName() +
+ ", serviceType " + scHost.getServiceType() +
", component " + scHost.getServiceComponentName() + ", host " + scHost.getHostName());
scHost.updateActualConfigs(report.getConfigurationTags());
scHost.setRestartRequired(false);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java
index d778999..a5b3622 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java
@@ -39,8 +39,8 @@ public class StatusCommand extends AgentCommand {
@SerializedName("serviceName")
private String serviceName;
- @SerializedName("serviceDisplayName")
- private String serviceDisplayName;
+ @SerializedName("serviceType")
+ private String serviceType;
@SerializedName("componentName")
private String componentName;
@@ -120,10 +120,10 @@ public class StatusCommand extends AgentCommand {
this.serviceName = serviceName;
}
- public String getServiceDisplayName() { return serviceDisplayName; }
+ public String getServiceType() { return serviceType; }
- public void setServiceDisplayName(String serviceDisplayName) {
- this.serviceDisplayName = serviceDisplayName;
+ public void setServiceType(String serviceType) {
+ this.serviceType = serviceType;
}
public String getComponentName() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/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 fd15105..8883ced 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
@@ -287,34 +287,34 @@ public class AmbariMetaInfo {
/**
* Get components by service
*
- * @param stackName stack name
- * @param version stack version
- * @param serviceName service name
+ * @param stackName stack name
+ * @param version stack version
+ * @param stackServiceName stack service name
* @return List of ComponentInfo objects
* @throws AmbariException
*/
- public List<ComponentInfo> getComponentsByService(String stackName, String version, String serviceName)
+ public List<ComponentInfo> getComponentsByService(String stackName, String version, String stackServiceName)
throws AmbariException {
ServiceInfo service;
try {
- service = getService(stackName, version, serviceName);
+ service = getService(stackName, version, stackServiceName);
} catch (StackAccessException e) {
throw new ParentObjectNotFoundException("Parent Service resource doesn't exist. stackName=" +
- stackName + ", stackVersion=" + version + ", serviceName=" + serviceName);
+ stackName + ", stackVersion=" + version + ", stackServiceName=" + stackServiceName);
}
return service.getComponents();
}
- public ComponentInfo getComponent(String stackName, String version, String serviceDisplayName,
+ public ComponentInfo getComponent(String stackName, String version, String stackServiceName,
String componentName) throws AmbariException {
- ComponentInfo component = getService(stackName, version, serviceDisplayName).getComponentByName(componentName);
+ ComponentInfo component = getService(stackName, version, stackServiceName).getComponentByName(componentName);
if (component == null) {
throw new StackAccessException("stackName=" + stackName
+ ", stackVersion=" + version
- + ", serviceDisplayName=" + serviceDisplayName
+ + ", stackServiceName=" + stackServiceName
+ ", componentName=" + componentName);
}
return component;
@@ -459,10 +459,10 @@ public class AmbariMetaInfo {
/*
* support isValidService(), isValidComponent for a given stack/version
*/
- public boolean isValidService(String stackName, String version, String serviceName){
+ public boolean isValidService(String stackName, String version, String stackServiceName){
try {
- getService(stackName, version, serviceName);
+ getService(stackName, version, stackServiceName);
return true;
} catch (AmbariException e) {
return false;
@@ -473,9 +473,9 @@ public class AmbariMetaInfo {
* support isValidService(), isValidComponent for a given stack/version
*/
public boolean isValidServiceComponent(String stackName, String version,
- String serviceName, String componentName) {
+ String stackServiceName, String componentName) {
try {
- getService(stackName, version, serviceName).getComponentByName(componentName);
+ getService(stackName, version, stackServiceName).getComponentByName(componentName);
return true;
} catch (AmbariException e) {
return false;
@@ -549,30 +549,30 @@ public class AmbariMetaInfo {
*/
public ServiceInfo getService(Service service) throws AmbariException {
StackId stackId = service.getDesiredStackId();
- return getService(stackId.getStackName(), stackId.getStackVersion(), service.getName());
+ return getService(stackId.getStackName(), stackId.getStackVersion(), service.getServiceType());
}
- public ServiceInfo getService(String stackName, String version, String serviceName) throws AmbariException {
- ServiceInfo service = getStack(stackName, version).getService(serviceName);
+ public ServiceInfo getService(String stackName, String version, String stackServiceName) throws AmbariException {
+ ServiceInfo service = getStack(stackName, version).getService(stackServiceName);
if (service == null) {
throw new StackAccessException("stackName=" + stackName + ", stackVersion=" +
- version + ", serviceName=" + serviceName);
+ version + ", stackServiceName=" + stackServiceName);
}
return service;
}
- public boolean isServiceRemovedInStack(String stackName, String version, String serviceName) throws AmbariException{
+ public boolean isServiceRemovedInStack(String stackName, String version, String stackServiceName) throws AmbariException{
StackInfo stack = getStack(stackName, version);
List<String> removedServices = stack.getRemovedServices();
- return removedServices.contains(serviceName);
+ return removedServices.contains(stackServiceName);
}
- public boolean isServiceWithNoConfigs(String stackName, String version, String serviceName) throws AmbariException{
+ public boolean isServiceWithNoConfigs(String stackName, String version, String stackServiceName) throws AmbariException{
StackInfo stack = getStack(stackName, version);
List<String> servicesWithNoConfigs = stack.getServicesWithNoConfigs();
- return servicesWithNoConfigs.contains(serviceName);
+ return servicesWithNoConfigs.contains(stackServiceName);
}
public Collection<String> getMonitoringServiceNames(String stackName, String version)
@@ -730,10 +730,10 @@ public class AmbariMetaInfo {
return result;
}
- public Set<PropertyInfo> getServiceProperties(String stackName, String version, String serviceName)
+ public Set<PropertyInfo> getServiceProperties(String stackName, String version, String stackServiceName)
throws AmbariException {
- return new HashSet<>(getService(stackName, version, serviceName).getProperties());
+ return new HashSet<>(getService(stackName, version, stackServiceName).getProperties());
}
public Set<PropertyInfo> getStackProperties(String stackName, String version)
@@ -742,17 +742,17 @@ public class AmbariMetaInfo {
return new HashSet<>(getStack(stackName, version).getProperties());
}
- public Set<PropertyInfo> getPropertiesByName(String stackName, String version, String serviceName, String propertyName)
+ public Set<PropertyInfo> getPropertiesByName(String stackName, String version, String stackServiceName, String propertyName)
throws AmbariException {
- Set<PropertyInfo> properties = serviceName == null ?
+ Set<PropertyInfo> properties = stackServiceName == null ?
getStackProperties(stackName, version)
- : getServiceProperties(stackName, version, serviceName);
+ : getServiceProperties(stackName, version, stackServiceName);
if (properties.size() == 0) {
throw new StackAccessException("stackName=" + stackName
+ ", stackVersion=" + version
- + ", serviceName=" + serviceName
+ + ", stackServiceName=" + stackServiceName
+ ", propertyName=" + propertyName);
}
@@ -767,7 +767,7 @@ public class AmbariMetaInfo {
if (propertyResult.isEmpty()) {
throw new StackAccessException("stackName=" + stackName
+ ", stackVersion=" + version
- + ", serviceName=" + serviceName
+ + ", stackServiceName=" + stackServiceName
+ ", propertyName=" + propertyName);
}
@@ -911,12 +911,12 @@ public class AmbariMetaInfo {
* Return metrics for a stack service.
*/
public Map<String, Map<String, List<MetricDefinition>>> getServiceMetrics(String stackName,
- String stackVersion, String serviceName) throws AmbariException {
+ String stackVersion, String stackServiceName) throws AmbariException {
- ServiceInfo svc = getService(stackName, stackVersion, serviceName);
+ ServiceInfo svc = getService(stackName, stackVersion, stackServiceName);
if (null == svc.getMetricsFile() || !svc.getMetricsFile().exists()) {
- LOG.debug("Metrics file for {}/{}/{} not found.", stackName, stackVersion, serviceName);
+ LOG.debug("Metrics file for {}/{}/{} not found.", stackName, stackVersion, stackServiceName);
return null;
}
@@ -1022,11 +1022,11 @@ public class AmbariMetaInfo {
* @return the list of defined metrics.
*/
public List<MetricDefinition> getMetrics(String stackName, String stackVersion,
- String serviceName, String componentName, String metricType)
+ String stackServiceName, String componentName, String metricType)
throws AmbariException {
Map<String, Map<String, List<MetricDefinition>>> map = getServiceMetrics(
- stackName, stackVersion, serviceName);
+ stackName, stackVersion, stackServiceName);
if (map != null && map.containsKey(componentName)) {
if (map.get(componentName).containsKey(metricType)) {
@@ -1044,16 +1044,16 @@ public class AmbariMetaInfo {
* the stack name
* @param stackVersion
* the stack version
- * @param serviceName
- * the service name
+ * @param stackServiceName
+ * the stack service name
* @return the alert definitions for a stack or an empty list if none (never
* {@code null}).
* @throws AmbariException
*/
public Set<AlertDefinition> getAlertDefinitions(String stackName, String stackVersion,
- String serviceName) throws AmbariException {
+ String stackServiceName) throws AmbariException {
- ServiceInfo svc = getService(stackName, stackVersion, serviceName);
+ ServiceInfo svc = getService(stackName, stackVersion, stackServiceName);
return getAlertDefinitions(svc);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/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 dfe117e..60230f6 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
@@ -62,23 +62,23 @@ public class ComponentService extends BaseService {
/**
* Parent service display name.
*/
- private String m_serviceDisplayName;
+ private String m_serviceName;
/**
* Constructor.
*
* @param clusterName cluster name
* @param serviceGroupName servicegroup name
- * @param serviceDisplayName service display name
+ * @param serviceName service name
*/
- public ComponentService(String clusterName, String serviceGroupName, String serviceDisplayName) {
+ public ComponentService(String clusterName, String serviceGroupName, String serviceName) {
m_clusterName = clusterName;
m_serviceGroupName = serviceGroupName;
- m_serviceDisplayName = serviceDisplayName;
+ m_serviceName = serviceName;
}
/**
- * Handles GET: /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/components/{componentName}
+ * Handles GET: /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/components/{componentName}
* Get a specific component.
*
* @param headers http headers
@@ -99,7 +99,7 @@ public class ComponentService extends BaseService {
}
/**
- * Handles GET: /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/components
+ * Handles GET: /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/components
* Get all components for a service.
*
* @param headers http headers
@@ -119,7 +119,7 @@ public class ComponentService extends BaseService {
}
/**
- * Handles: POST /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/components
+ * Handles: POST /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/components
* Create components by specifying an array of components in the http body.
* This is used to create multiple components in a single request.
*
@@ -138,7 +138,7 @@ public class ComponentService extends BaseService {
}
/**
- * Handles: POST /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/components/{componentID}
+ * Handles: POST /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/components/{componentID}
* Create a specific component.
*
* @param body http body
@@ -159,7 +159,7 @@ public class ComponentService extends BaseService {
}
/**
- * Handles: PUT /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/components/{componentID}
+ * Handles: PUT /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/components/{componentID}
* Update a specific component.
*
* @param body http body
@@ -179,7 +179,7 @@ public class ComponentService extends BaseService {
}
/**
- * Handles: PUT /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/components
+ * Handles: PUT /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/components
* Update multiple components.
*
* @param body http body
@@ -196,7 +196,7 @@ public class ComponentService extends BaseService {
}
/**
- * Handles: DELETE /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/components/{componentID}
+ * Handles: DELETE /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/components/{componentID}
* Delete a specific component.
*
* @param headers http headers
@@ -225,7 +225,7 @@ public class ComponentService extends BaseService {
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_serviceDisplayName == null? null : m_serviceDisplayName.toString());
+ mapIds.put(Resource.Type.Service, m_serviceName == null? null : m_serviceName.toString());
mapIds.put(Resource.Type.Component, componentName);
return createResource(Resource.Type.Component, mapIds);
@@ -235,15 +235,15 @@ public class ComponentService extends BaseService {
String componentName) {
Map<Resource.Type,String> mapIds = new HashMap<>();
mapIds.put(Resource.Type.Cluster, m_clusterName);
- mapIds.put(Resource.Type.Service, m_serviceDisplayName);
+ mapIds.put(Resource.Type.Service, m_serviceName);
mapIds.put(Resource.Type.Component, componentName);
String filePrefixName;
if (StringUtils.isEmpty(componentName)) {
- if (StringUtils.isEmpty(m_serviceDisplayName)) {
+ if (StringUtils.isEmpty(m_serviceName)) {
filePrefixName = m_clusterName + "(" + Resource.InternalType.Cluster.toString().toUpperCase()+")";
} else {
- filePrefixName = m_serviceDisplayName + "(" + Resource.InternalType.Service.toString().toUpperCase()+")";
+ filePrefixName = m_serviceName + "(" + Resource.InternalType.Service.toString().toUpperCase()+")";
}
} else {
filePrefixName = componentName;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java
index 7a5e9ab..12f4bca 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java
@@ -78,16 +78,16 @@ public class ServiceService extends BaseService {
}
/**
- * Handles URL: /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}
+ * Handles URL: /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}
* Get a specific service.
*
* @param headers http headers
* @param ui uri info
- * @param serviceDisplayName service display name
+ * @param serviceName service name
* @return service resource representation
*/
@GET
- @Path("{serviceDisplayName}")
+ @Path("{serviceName}")
@Produces(MediaType.TEXT_PLAIN)
@ApiOperation(value = "Get the details of a service",
nickname = "ServiceService#getService",
@@ -104,10 +104,10 @@ public class ServiceService extends BaseService {
@ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR)
})
public Response getService(String body, @Context HttpHeaders headers, @Context UriInfo ui,
- @ApiParam @PathParam("serviceDisplayName") String serviceDisplayName) {
+ @ApiParam @PathParam("serviceName") String serviceName) {
return handleRequest(headers, body, ui, Request.Type.GET,
- createServiceResource(m_clusterName, m_serviceGroupName, serviceDisplayName));
+ createServiceResource(m_clusterName, m_serviceGroupName, serviceName));
}
/**
@@ -147,17 +147,17 @@ public class ServiceService extends BaseService {
}
/**
- * Handles: POST /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}
+ * Handles: POST /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}
* Create a specific service.
*
* @param body http body
* @param headers http headers
* @param ui uri info
- * @param serviceDisplayName service display name
+ * @param serviceName service name
* @return information regarding the created service
*/
@POST
- @Path("{serviceDisplayName}")
+ @Path("{serviceName}")
@Produces(MediaType.TEXT_PLAIN)
@ApiOperation(value = "Creates a service",
nickname = "ServiceService#createServices"
@@ -176,9 +176,9 @@ public class ServiceService extends BaseService {
@ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR),
})
public Response createService(String body, @Context HttpHeaders headers, @Context UriInfo ui,
- @ApiParam @PathParam("serviceDisplayName") String serviceDisplayName) {
+ @ApiParam @PathParam("serviceName") String serviceName) {
return handleRequest(headers, body, ui, Request.Type.POST,
- createServiceResource(m_clusterName, m_serviceGroupName, serviceDisplayName));
+ createServiceResource(m_clusterName, m_serviceGroupName, serviceName));
}
/**
@@ -215,17 +215,17 @@ public class ServiceService extends BaseService {
}
/**
- * Handles: PUT /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}
+ * Handles: PUT /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}
* Update a specific service.
*
* @param body http body
* @param headers http headers
* @param ui uri info
- * @param serviceDisplayName service display name
+ * @param serviceName service name
* @return information regarding the updated service
*/
@PUT
- @Path("{serviceDisplayName}")
+ @Path("{serviceName}")
@Produces(MediaType.TEXT_PLAIN)
@ApiOperation(value = "Updates a service",
nickname = "ServiceService#updateService"
@@ -243,8 +243,8 @@ public class ServiceService extends BaseService {
@ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR),
})
public Response updateService(String body, @Context HttpHeaders headers, @Context UriInfo ui,
- @ApiParam @PathParam("serviceDisplayName") String serviceDisplayName) {
- return handleRequest(headers, body, ui, Request.Type.PUT, createServiceResource(m_clusterName, m_serviceGroupName, serviceDisplayName));
+ @ApiParam @PathParam("serviceName") String serviceName) {
+ return handleRequest(headers, body, ui, Request.Type.PUT, createServiceResource(m_clusterName, m_serviceGroupName, serviceName));
}
/**
@@ -279,16 +279,16 @@ public class ServiceService extends BaseService {
}
/**
- * Handles: DELETE /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}
+ * Handles: DELETE /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}
* Delete a specific service.
*
* @param headers http headers
* @param ui uri info
- * @param serviceDisplayName service display name
+ * @param serviceName service name
* @return information regarding the deleted service
*/
@DELETE
- @Path("{serviceDisplayName}")
+ @Path("{serviceName}")
@Produces(MediaType.TEXT_PLAIN)
@ApiOperation(value = "Deletes a service",
nickname = "ServiceService#deleteService"
@@ -301,47 +301,47 @@ public class ServiceService extends BaseService {
@ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR),
})
public Response deleteService(@Context HttpHeaders headers, @Context UriInfo ui,
- @ApiParam(required = true) @PathParam("serviceDisplayName") String serviceDisplayName) {
- return handleRequest(headers, null, ui, Request.Type.DELETE, createServiceResource(m_clusterName, m_serviceGroupName, serviceDisplayName));
+ @ApiParam(required = true) @PathParam("serviceName") String serviceName) {
+ return handleRequest(headers, null, ui, Request.Type.DELETE, createServiceResource(m_clusterName, m_serviceGroupName, serviceName));
}
/**
* Get the components sub-resource.
*
- * @param serviceDisplayName service display name
+ * @param serviceName service name
* @return the components service
*/
- @Path("{serviceDisplayName}/components")
+ @Path("{serviceName}/components")
// TODO: find a way to handle this with Swagger (refactor or custom annotation?)
- public ComponentService getComponentHandler(@PathParam("serviceDisplayName") String serviceDisplayName) {
+ public ComponentService getComponentHandler(@PathParam("serviceName") String serviceName) {
- return new ComponentService(m_clusterName, m_serviceGroupName, serviceDisplayName);
+ return new ComponentService(m_clusterName, m_serviceGroupName, serviceName);
}
/**
* Gets the alerts sub-resource.
*/
- @Path("{serviceDisplayName}/alerts")
+ @Path("{serviceName}/alerts")
// TODO: find a way to handle this with Swagger (refactor or custom annotation?)
public AlertService getAlertHandler(
- @PathParam("serviceDisplayName") String serviceDisplayName) {
- return new AlertService(m_clusterName, serviceDisplayName, null);
+ @PathParam("serviceName") String serviceName) {
+ return new AlertService(m_clusterName, serviceName, null);
}
/**
- * Handles: POST /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/artifacts/{artifactName}
+ * Handles: POST /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/artifacts/{artifactName}
* Create a service artifact instance.
*
* @param body http body
* @param headers http headers
* @param ui uri info
- * @param serviceDisplayName service display name
+ * @param serviceName service name
* @param artifactName artifact name
*
* @return information regarding the created artifact
*/
@POST
- @Path("{serviceDisplayName}/artifacts/{artifactName}")
+ @Path("{serviceName}/artifacts/{artifactName}")
@Produces(MediaType.TEXT_PLAIN)
@ApiOperation(value = "Creates a service artifact",
nickname = "ServiceService#createArtifact"
@@ -362,26 +362,26 @@ public class ServiceService extends BaseService {
public Response createArtifact(String body,
@Context HttpHeaders headers,
@Context UriInfo ui,
- @ApiParam @PathParam("serviceDisplayName") String serviceDisplayName,
+ @ApiParam @PathParam("serviceName") String serviceName,
@ApiParam @PathParam("artifactName") String artifactName) {
return handleRequest(headers, body, ui, Request.Type.POST,
- createArtifactResource(m_clusterName, m_serviceGroupName, serviceDisplayName, artifactName));
+ createArtifactResource(m_clusterName, m_serviceGroupName, serviceName, artifactName));
}
/**
- * Handles: GET /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/artifacts
+ * Handles: GET /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/artifacts
* Get all service artifacts.
*
* @param body http body
* @param headers http headers
* @param ui uri info
- * @param serviceDisplayName service display name
+ * @param serviceName service name
*
* @return artifact collection resource representation
*/
@GET
- @Path("{serviceDisplayName}/artifacts")
+ @Path("{serviceName}/artifacts")
@Produces(MediaType.TEXT_PLAIN)
@ApiOperation(value = "Get all service artifacts",
nickname = "ServiceService#getArtifacts",
@@ -406,26 +406,26 @@ public class ServiceService extends BaseService {
public Response getArtifacts(String body,
@Context HttpHeaders headers,
@Context UriInfo ui,
- @PathParam("serviceDisplayName") String serviceDisplayName) {
+ @PathParam("serviceName") String serviceName) {
return handleRequest(headers, body, ui, Request.Type.GET,
- createArtifactResource(m_clusterName, m_serviceGroupName, serviceDisplayName, null));
+ createArtifactResource(m_clusterName, m_serviceGroupName, serviceName, null));
}
/**
- * Handles: GET /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/artifacts/{artifactName}
+ * Handles: GET /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/artifacts/{artifactName}
* Gat a service artifact instance.
*
* @param body http body
* @param headers http headers
* @param ui uri info
- * @param serviceDisplayName service display name
+ * @param serviceName service name
* @param artifactName artifact name
*
* @return artifact instance resource representation
*/
@GET
- @Path("{serviceDisplayName}/artifacts/{artifactName}")
+ @Path("{serviceName}/artifacts/{artifactName}")
@Produces(MediaType.TEXT_PLAIN)
@ApiOperation(value = "Get the details of a service artifact",
nickname = "ServiceService#getArtifact",
@@ -450,24 +450,24 @@ public class ServiceService extends BaseService {
public Response getArtifact(String body,
@Context HttpHeaders headers,
@Context UriInfo ui,
- @ApiParam @PathParam("serviceDisplayName") String serviceDisplayName,
+ @ApiParam @PathParam("serviceName") String serviceName,
@ApiParam @PathParam("artifactName") String artifactName) {
return handleRequest(headers, body, ui, Request.Type.GET,
- createArtifactResource(m_clusterName, m_serviceGroupName, serviceDisplayName, artifactName));
+ createArtifactResource(m_clusterName, m_serviceGroupName, serviceName, artifactName));
}
/**
- * Handles: PUT /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/artifacts
+ * Handles: PUT /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/artifacts
* Update all artifacts matching the provided predicate.
*
* @param headers http headers
* @param ui uri info
- * @param serviceDisplayName service display name
+ * @param serviceName service name
*
* @return information regarding the updated artifacts
*/
@PUT
- @Path("{serviceDisplayName}/artifacts")
+ @Path("{serviceName}/artifacts")
@Produces(MediaType.TEXT_PLAIN)
@ApiOperation(value = "Updates multiple artifacts",
nickname = "ServiceService#updateArtifacts"
@@ -487,25 +487,25 @@ public class ServiceService extends BaseService {
public Response updateArtifacts(String body,
@Context HttpHeaders headers,
@Context UriInfo ui,
- @ApiParam @PathParam("serviceDisplayName") String serviceDisplayName) {
+ @ApiParam @PathParam("serviceName") String serviceName) {
return handleRequest(headers, body, ui, Request.Type.PUT,
- createArtifactResource(m_clusterName, m_serviceGroupName, serviceDisplayName, null));
+ createArtifactResource(m_clusterName, m_serviceGroupName, serviceName, null));
}
/**
- * Handles: PUT /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/artifacts/{artifactName}
+ * Handles: PUT /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/artifacts/{artifactName}
* Update a specific artifact.
*
* @param headers http headers
* @param ui uri info
- * @param serviceDisplayName service display name
+ * @param serviceName service name
* @param artifactName artifact name
*
* @return information regarding the updated artifact
*/
@PUT
- @Path("{serviceDisplayName}/artifacts/{artifactName}")
+ @Path("{serviceName}/artifacts/{artifactName}")
@Produces(MediaType.TEXT_PLAIN)
@ApiOperation(value = "Updates a single artifact",
nickname = "ServiceService#updateArtifact"
@@ -525,25 +525,25 @@ public class ServiceService extends BaseService {
public Response updateArtifact(String body,
@Context HttpHeaders headers,
@Context UriInfo ui,
- @ApiParam(required = true) @PathParam("serviceDisplayName") String serviceDisplayName,
+ @ApiParam(required = true) @PathParam("serviceName") String serviceName,
@ApiParam(required = true) @PathParam("artifactName") String artifactName) {
return handleRequest(headers, body, ui, Request.Type.PUT,
- createArtifactResource(m_clusterName, m_serviceGroupName, serviceDisplayName, artifactName));
+ createArtifactResource(m_clusterName, m_serviceGroupName, serviceName, artifactName));
}
/**
- * Handles: DELETE /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/artifacts
+ * Handles: DELETE /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/artifacts
* Delete all artifacts matching the provided predicate.
*
* @param headers http headers
* @param ui uri info
- * @param serviceDisplayName service display name
+ * @param serviceName service name
*
* @return information regarding the deleted artifacts
*/
@DELETE
- @Path("{serviceDisplayName}/artifacts")
+ @Path("{serviceName}/artifacts")
@Produces(MediaType.TEXT_PLAIN)
@ApiOperation(value = "Deletes all artifacts of a service that match the provided predicate",
nickname = "ServiceService#deleteArtifacts"
@@ -558,25 +558,25 @@ public class ServiceService extends BaseService {
public Response deleteArtifacts(String body,
@Context HttpHeaders headers,
@Context UriInfo ui,
- @ApiParam(required = true) @PathParam("serviceDisplayName") String serviceDisplayName) {
+ @ApiParam(required = true) @PathParam("serviceName") String serviceName) {
return handleRequest(headers, body, ui, Request.Type.DELETE,
- createArtifactResource(m_clusterName, m_serviceGroupName, serviceDisplayName, null));
+ createArtifactResource(m_clusterName, m_serviceGroupName, serviceName, null));
}
/**
- * Handles: DELETE /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/artifacts/{artifactName}
+ * Handles: DELETE /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/artifacts/{artifactName}
* Delete a specific artifact.
*
* @param headers http headers
* @param ui uri info
- * @param serviceDisplayName service display name
+ * @param serviceName service name
* @param artifactName artifact name
*
* @return information regarding the deleted artifact
*/
@DELETE
- @Path("{serviceDisplayName}/artifacts/{artifactName}")
+ @Path("{serviceName}/artifacts/{artifactName}")
@Produces(MediaType.TEXT_PLAIN)
@ApiOperation(value = "Deletes a single service artifact",
nickname = "ServiceService#deleteArtifact"
@@ -591,11 +591,11 @@ public class ServiceService extends BaseService {
public Response deleteArtifact(String body,
@Context HttpHeaders headers,
@Context UriInfo ui,
- @ApiParam(required = true) @PathParam("serviceDisplayName") String serviceDisplayName,
+ @ApiParam(required = true) @PathParam("serviceName") String serviceName,
@ApiParam(required = true) @PathParam("artifactName") String artifactName) {
return handleRequest(headers, body, ui, Request.Type.DELETE,
- createArtifactResource(m_clusterName, m_serviceGroupName, serviceDisplayName, artifactName));
+ createArtifactResource(m_clusterName, m_serviceGroupName, serviceName, artifactName));
}
/**
@@ -603,33 +603,33 @@ public class ServiceService extends BaseService {
*
* @param request
* the request
- * @param serviceDisplayName
- * the service display name
+ * @param serviceName
+ * the service name
*
* @return the alert history service
*/
- @Path("{serviceDisplayName}/alert_history")
+ @Path("{serviceName}/alert_history")
// TODO: find a way to handle this with Swagger (refactor or custom annotation?)
public AlertHistoryService getAlertHistoryService(
@Context javax.ws.rs.core.Request request,
- @PathParam("serviceDisplayName") String serviceDisplayName) {
+ @PathParam("serviceName") String serviceName) {
- return new AlertHistoryService(m_clusterName, serviceDisplayName, null);
+ return new AlertHistoryService(m_clusterName, serviceName, null);
}
/**
* Create a service resource instance.
*
* @param clusterName cluster name
- * @param serviceDisplayName service display name
+ * @param serviceName service name
*
* @return a service resource instance
*/
- ResourceInstance createServiceResource(String clusterName, String serviceGroupName, String serviceDisplayName) {
+ ResourceInstance createServiceResource(String clusterName, String serviceGroupName, String serviceName) {
Map<Resource.Type,String> mapIds = new HashMap<>();
mapIds.put(Resource.Type.Cluster, clusterName);
mapIds.put(Resource.Type.ServiceGroup, serviceGroupName);
- mapIds.put(Resource.Type.Service, serviceDisplayName);
+ mapIds.put(Resource.Type.Service, serviceName);
return createResource(Resource.Type.Service, mapIds);
}
@@ -638,16 +638,16 @@ public class ServiceService extends BaseService {
* Create an artifact resource instance.
*
* @param clusterName cluster name
- * @param serviceDisplayName service display name
+ * @param serviceName service name
* @param artifactName artifact name
*
* @return an artifact resource instance
*/
- ResourceInstance createArtifactResource(String clusterName, String serviceGroupName, String serviceDisplayName, String artifactName) {
+ ResourceInstance createArtifactResource(String clusterName, String serviceGroupName, String serviceName, String artifactName) {
Map<Resource.Type,String> mapIds = new HashMap<>();
mapIds.put(Resource.Type.Cluster, clusterName);
mapIds.put(Resource.Type.ServiceGroup, serviceGroupName);
- mapIds.put(Resource.Type.Service, serviceDisplayName);
+ mapIds.put(Resource.Type.Service, serviceName);
mapIds.put(Resource.Type.Artifact, artifactName);
return createResource(Resource.Type.Artifact, mapIds);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheck.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheck.java
index e9c9059..349b260 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheck.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheck.java
@@ -99,7 +99,7 @@ public class SecondaryNamenodeDeletedCheck extends AbstractCheckDescriptor {
List<HostComponentStateEntity> allHostComponents = hostComponentStateDao.findAll();
for(HostComponentStateEntity hc : allHostComponents) {
Service s = cluster.getService(hc.getServiceId());
- if (s.getName().equalsIgnoreCase(HDFS_SERVICE_NAME) && hc.getComponentName().equalsIgnoreCase(SECONDARY_NAMENODE)) {
+ if (s.getServiceType().equalsIgnoreCase(HDFS_SERVICE_NAME) && hc.getComponentName().equalsIgnoreCase(SECONDARY_NAMENODE)) {
hosts.add(hc.getHostName());
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/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 e9fa8db..9977d0c 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
@@ -606,33 +606,33 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
throw new AuthorizationException("The authenticated user is not authorized to install service components on to hosts");
}
- if (StringUtils.isEmpty(request.getServiceDisplayName())) {
- request.setServiceDisplayName(findService(cluster, request.getComponentName()));
+ if (StringUtils.isEmpty(request.getServiceName())) {
+ request.setServiceName(findService(cluster, request.getComponentName()));
// TODO : What if request.getServiceGroupName() is null ? Get it from service instead.
}
if (LOG.isDebugEnabled()) {
LOG.debug("Received a createHostComponent request, clusterName={}, serviceGroupName={}, serviceName={}, componentName={}, hostname={}, request={}",
- request.getClusterName(), request.getServiceGroupName(), request.getServiceDisplayName(), request.getComponentName(), request.getHostname(), request);
+ request.getClusterName(), request.getServiceGroupName(), request.getServiceName(), request.getComponentName(), request.getHostname(), request);
}
if (!hostComponentNames.containsKey(request.getClusterName())) {
hostComponentNames.put(request.getClusterName(), new HashMap<>());
}
if (!hostComponentNames.get(request.getClusterName())
- .containsKey(request.getServiceDisplayName())) {
+ .containsKey(request.getServiceName())) {
hostComponentNames.get(request.getClusterName()).put(
- request.getServiceDisplayName(), new HashMap<String, Set<String>>());
+ request.getServiceName(), new HashMap<String, Set<String>>());
}
if (!hostComponentNames.get(request.getClusterName())
- .get(request.getServiceDisplayName())
+ .get(request.getServiceName())
.containsKey(request.getComponentName())) {
hostComponentNames.get(request.getClusterName())
- .get(request.getServiceDisplayName()).put(request.getComponentName(),
+ .get(request.getServiceName()).put(request.getComponentName(),
new HashSet<String>());
}
if (hostComponentNames.get(request.getClusterName())
- .get(request.getServiceDisplayName())
+ .get(request.getServiceName())
.get(request.getComponentName())
.contains(request.getHostname())) {
duplicates.add("[clusterName=" + request.getClusterName() + ", hostName=" + request.getHostname() +
@@ -640,7 +640,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
continue;
}
hostComponentNames.get(request.getClusterName())
- .get(request.getServiceDisplayName()).get(request.getComponentName())
+ .get(request.getServiceName()).get(request.getComponentName())
.add(request.getHostname());
if (request.getDesiredState() != null
@@ -656,10 +656,10 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
Service s;
try {
- s = cluster.getService(request.getServiceDisplayName());
+ s = cluster.getService(request.getServiceName());
} catch (ServiceNotFoundException e) {
throw new IllegalArgumentException(
- "The service[" + request.getServiceDisplayName() + "] associated with the component[" +
+ "The service[" + request.getServiceName() + "] associated with the component[" +
request.getComponentName() + "] doesn't exist for the cluster[" + request.getClusterName() + "]");
}
ServiceComponent sc = s.getServiceComponent(
@@ -743,7 +743,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
for (ServiceComponentHostRequest request : requests) {
Cluster cluster = clusters.getCluster(request.getClusterName());
- Service s = cluster.getService(request.getServiceDisplayName());
+ Service s = cluster.getService(request.getServiceName());
ServiceComponent sc = s.getServiceComponent(
request.getComponentName());
@@ -1236,7 +1236,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
}
if (request.getComponentName() != null) {
- if (StringUtils.isBlank(request.getServiceDisplayName())) {
+ if (StringUtils.isBlank(request.getServiceName())) {
// !!! FIXME the assumption that a component is unique across all stacks is a ticking
// time bomb. Blueprints are making this assumption.
@@ -1247,13 +1247,13 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
throw new ServiceComponentHostNotFoundException(
cluster.getClusterName(), null, request.getComponentName(), request.getHostname());
}
- request.setServiceDisplayName(serviceName);
+ request.setServiceName(serviceName);
}
}
Set<Service> services = new HashSet<>();
- if (request.getServiceDisplayName() != null && !request.getServiceDisplayName().isEmpty()) {
- services.add(cluster.getService(request.getServiceDisplayName()));
+ if (request.getServiceName() != null && !request.getServiceName().isEmpty()) {
+ services.add(cluster.getService(request.getServiceName()));
} else {
services.addAll(cluster.getServices().values());
}
@@ -1363,7 +1363,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
response.add(r);
} catch (ServiceComponentHostNotFoundException e) {
- if (request.getServiceDisplayName() == null || request.getComponentName() == null) {
+ if (request.getServiceName() == null || request.getComponentName() == null) {
// Ignore the exception if either the service name or component name are not specified.
// This is an artifact of how we get host_components and can happen in the case where
// we get all host_components for a host, for example.
@@ -1375,7 +1375,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
// condition.
LOG.debug("ServiceComponentHost not found ", e);
throw new ServiceComponentHostNotFoundException(cluster.getClusterName(),
- request.getServiceDisplayName(), request.getComponentName(), request.getHostname());
+ request.getServiceName(), request.getComponentName(), request.getHostname());
}
}
} else {
@@ -3535,14 +3535,14 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
}
private void checkIfHostComponentsInDeleteFriendlyState(ServiceComponentHostRequest request, Cluster cluster) throws AmbariException {
- Service service = cluster.getService(request.getServiceDisplayName());
+ Service service = cluster.getService(request.getServiceName());
ServiceComponent component = service.getServiceComponent(request.getComponentName());
ServiceComponentHost componentHost = component.getServiceComponentHost(request.getHostname());
if (!componentHost.canBeRemoved()) {
throw new AmbariException("Host Component cannot be removed"
+ ", clusterName=" + request.getClusterName()
- + ", serviceDisplayName=" + request.getServiceDisplayName()
+ + ", serviceName=" + request.getServiceName()
+ ", componentName=" + request.getComponentName()
+ ", hostname=" + request.getHostname()
+ ", request=" + request);
@@ -3560,7 +3560,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
@Override
public String findService(Cluster cluster, String componentName) throws AmbariException {
- return cluster.getServiceByComponentName(componentName).getServiceDisplayName();
+ return cluster.getServiceByComponentName(componentName).getName();
}
/**
@@ -3681,18 +3681,18 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
Cluster cluster = clusters.getCluster(request.getClusterName());
- if (StringUtils.isEmpty(request.getServiceDisplayName())) {
- request.setServiceDisplayName(findService(cluster, request.getComponentName()));
+ if (StringUtils.isEmpty(request.getServiceName())) {
+ request.setServiceName(findService(cluster, request.getComponentName()));
}
LOG.info("Received a hostComponent DELETE request"
+ ", clusterName=" + request.getClusterName()
- + ", serviceDisplayName=" + request.getServiceDisplayName()
+ + ", serviceName=" + request.getServiceName()
+ ", componentName=" + request.getComponentName()
+ ", hostname=" + request.getHostname()
+ ", request=" + request);
- Service service = cluster.getService(request.getServiceDisplayName());
+ Service service = cluster.getService(request.getServiceName());
ServiceComponent component = service.getServiceComponent(request.getComponentName());
ServiceComponentHost componentHost = component.getServiceComponentHost(request.getHostname());
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java
index 7c4c9ab..ea082c6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java
@@ -24,7 +24,7 @@ public class ServiceComponentHostRequest {
private String clusterName; // REF
private String serviceGroupName;
- private String serviceDisplayName;
+ private String serviceName;
private String componentName;
private String hostname;
private String publicHostname;
@@ -44,7 +44,7 @@ public class ServiceComponentHostRequest {
super();
this.clusterName = clusterName;
this.serviceGroupName = serviceGroupName;
- this.serviceDisplayName = serviceDisplayName;
+ this.serviceName = serviceName;
this.componentName = componentName;
this.hostname = hostname;
this.desiredState = desiredState;
@@ -63,15 +63,15 @@ public class ServiceComponentHostRequest {
/**
* @return the serviceName
*/
- public String getServiceDisplayName() {
- return serviceDisplayName;
+ public String getServiceName() {
+ return serviceName;
}
/**
- * @param serviceDisplayName the serviceName to set
+ * @param serviceName the serviceName to set
*/
- public void setServiceDisplayName(String serviceDisplayName) {
- this.serviceDisplayName = serviceDisplayName;
+ public void setServiceName(String serviceName) {
+ this.serviceName = serviceName;
}
/**
@@ -161,7 +161,7 @@ public class ServiceComponentHostRequest {
StringBuilder sb = new StringBuilder();
sb.append("{" + " clusterName=").append(clusterName)
.append(", serviceGroupName=").append(serviceGroupName)
- .append(", serviceDisplayName=").append(serviceDisplayName)
+ .append(", serviceName=").append(serviceName)
.append(", componentName=").append(componentName)
.append(", hostname=").append(hostname)
.append(", publicHostname=").append(publicHostname)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostResponse.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostResponse.java
index ebfbf5c..c420a50 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostResponse.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostResponse.java
@@ -32,7 +32,7 @@ public class ServiceComponentHostResponse {
private String serviceGroupName;
private Long serviceId;
private String serviceName;
- private String serviceDisplayName;
+ private String serviceType;
private Long hostComponentId;
private String componentName;
private String displayName;
@@ -51,7 +51,7 @@ public class ServiceComponentHostResponse {
private UpgradeState upgradeState = UpgradeState.NONE;
public ServiceComponentHostResponse(Long clusterId, String clusterName, Long serviceGroupId, String serviceGroupName,
- Long serviceId, String serviceName, String serviceDisplayName, Long hostComponentId,
+ Long serviceId, String serviceName, String serviceType, Long hostComponentId,
String componentName, String displayName, String hostname, String publicHostname,
String liveState, String version, String desiredState, String desiredStackVersion,
String desiredRepositoryVersion, HostComponentAdminState adminState) {
@@ -61,7 +61,7 @@ public class ServiceComponentHostResponse {
this.serviceId = serviceId;
this.clusterName = clusterName;
this.serviceName = serviceName;
- this.serviceDisplayName = serviceDisplayName;
+ this.serviceType = serviceType;
this.hostComponentId = hostComponentId;
this.componentName = componentName;
this.displayName = displayName;
@@ -134,12 +134,12 @@ public class ServiceComponentHostResponse {
/**
* @return the serviceName
*/
- public String getServiceDisplayName() { return serviceDisplayName; }
+ public String getServiceType() { return serviceType; }
/**
- * @param serviceDisplayName the serviceDisplayName to set
+ * @param serviceType the serviceType to set
*/
- public void setServiceDisplayName(String serviceDisplayName) { this.serviceDisplayName = serviceDisplayName; }
+ public void setServiceType(String serviceType) { this.serviceType = serviceType; }
/**
* @return the componentName
@@ -328,8 +328,8 @@ public class ServiceComponentHostResponse {
return false;
}
- if (serviceDisplayName != null ?
- !serviceDisplayName.equals(that.serviceDisplayName) : that.serviceDisplayName != null) {
+ if (serviceType != null ?
+ !serviceType.equals(that.serviceType) : that.serviceType != null) {
return false;
}
@@ -359,7 +359,7 @@ public class ServiceComponentHostResponse {
result = 71 * result + (serviceGroupName != null ? serviceGroupName.hashCode() : 0);
result = 71 * result + (serviceId != null ? serviceId.hashCode() : 0);
result = 71 * result + (serviceName != null ? serviceName.hashCode() : 0);
- result = 71 * result + (serviceDisplayName != null ? serviceDisplayName.hashCode() : 0);
+ result = 71 * result + (serviceType != null ? serviceType.hashCode() : 0);
result = 71 * result + (componentName != null ? componentName.hashCode() : 0);
result = 71 * result + (displayName != null ? displayName.hashCode() : 0);
result = 71 * result + (hostname != null ? hostname.hashCode() : 0);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentRequest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentRequest.java
index 1556b70..f59eb98 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentRequest.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentRequest.java
@@ -23,29 +23,29 @@ public class ServiceComponentRequest {
private String clusterName; // REF
private String serviceGroupName;
- private String serviceDisplayName; // GET/CREATE/UPDATE/DELETE
+ private String serviceName; // GET/CREATE/UPDATE/DELETE
private String componentName; // GET/CREATE/UPDATE/DELETE
private String desiredState; // CREATE/UPDATE
private String componentCategory;
private String recoveryEnabled; // CREATE/UPDATE
- public ServiceComponentRequest(String clusterName, String serviceGroupName, String serviceDisplayName,
+ public ServiceComponentRequest(String clusterName, String serviceGroupName, String serviceName,
String componentName, String desiredState) {
- this(clusterName, serviceGroupName, serviceDisplayName, componentName, desiredState, null, null);
+ this(clusterName, serviceGroupName, serviceName, componentName, desiredState, null, null);
}
- public ServiceComponentRequest(String clusterName, String serviceGroupName, String serviceDisplayName, String componentName,
+ public ServiceComponentRequest(String clusterName, String serviceGroupName, String serviceName, String componentName,
String desiredState, String recoveryEnabled) {
- this(clusterName, serviceGroupName, serviceDisplayName, componentName, desiredState, recoveryEnabled, null);
+ this(clusterName, serviceGroupName, serviceName, componentName, desiredState, recoveryEnabled, null);
}
public ServiceComponentRequest(String clusterName, String serviceGroupName,
- String serviceDisplayName, String componentName,
+ String serviceName, String componentName,
String desiredState, String recoveryEnabled,
String componentCategory) {
this.clusterName = clusterName;
this.serviceGroupName = serviceGroupName;
- this.serviceDisplayName = serviceDisplayName;
+ this.serviceName = serviceName;
this.componentName = componentName;
this.desiredState = desiredState;
this.recoveryEnabled = recoveryEnabled;
@@ -65,15 +65,15 @@ public class ServiceComponentRequest {
/**
* @return the serviceName
*/
- public String getServiceDisplayName() {
- return serviceDisplayName;
+ public String getServiceName() {
+ return serviceName;
}
/**
- * @param serviceDisplayName the serviceDisplayName to set
+ * @param serviceName the serviceName to set
*/
- public void setServiceDisplayName(String serviceDisplayName) {
- this.serviceDisplayName = serviceDisplayName;
+ public void setServiceName(String serviceName) {
+ this.serviceName = serviceName;
}
@@ -141,8 +141,8 @@ public class ServiceComponentRequest {
@Override
public String toString() {
- return String.format("[clusterName=%s, serviceGroupName=%s, serviceDisplayName=%s, componentName=%s, " +
- "desiredState=%s, recoveryEnabled=%s, componentCategory=%s]", clusterName, serviceGroupName,
- serviceDisplayName, clusterName, desiredState, recoveryEnabled, componentCategory);
+ return String.format("[clusterName=%s, serviceGroupName=%s, serviceName=%s, componentName=%s, " +
+ "desiredState=%s, recoveryEnabled=%s, componentCategory=%s]", clusterName, serviceGroupName,
+ serviceName, clusterName, desiredState, recoveryEnabled, componentCategory);
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentResponse.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentResponse.java
index b96fb8a..d63b33c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentResponse.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentResponse.java
@@ -32,7 +32,7 @@ public class ServiceComponentResponse {
private String serviceGroupName; // REF
private Long serviceId; // REF
private String serviceName;
- private String serviceDisplayName;
+ private String serviceType;
private String componentName;
private String displayName;
private String desiredStackId;
@@ -44,7 +44,7 @@ public class ServiceComponentResponse {
private RepositoryVersionState repoState;
public ServiceComponentResponse(Long clusterId, String clusterName, Long serviceGroupId, String serviceGroupName,
- Long serviceId, String serviceName, String serviceDisplayName, String componentName,
+ Long serviceId, String serviceName, String serviceType, String componentName,
StackId desiredStackId, String desiredState, Map<String, Integer> serviceComponentStateCount,
boolean recoveryEnabled, String displayName, String desiredVersion,
RepositoryVersionState repoState) {
@@ -54,7 +54,7 @@ public class ServiceComponentResponse {
this.serviceGroupName = serviceGroupName;
this.serviceId = serviceId;
this.serviceName = serviceName;
- this.serviceDisplayName = serviceDisplayName;
+ this.serviceType = serviceType;
this.componentName = componentName;
this.displayName = displayName;
this.desiredStackId = desiredStackId.getStackId();
@@ -82,12 +82,12 @@ public class ServiceComponentResponse {
/**
* @return the serviceName
*/
- public String getServiceDisplayName() { return serviceDisplayName; }
+ public String getServiceType() { return serviceType; }
/**
- * @param serviceDisplayName the serviceDisplayName to set
+ * @param serviceType the serviceType to set
*/
- public void setServiceDisplayName(String serviceDisplayName) { this.serviceDisplayName = serviceDisplayName; }
+ public void setServiceType(String serviceType) { this.serviceType = serviceType; }
/**
* @return the serviceId
@@ -288,8 +288,8 @@ public class ServiceComponentResponse {
return false;
}
- if (serviceDisplayName != null ?
- !serviceDisplayName.equals(that.serviceDisplayName) : that.serviceDisplayName != null) {
+ if (serviceType != null ?
+ !serviceType.equals(that.serviceType) : that.serviceType != null) {
return false;
}
@@ -314,7 +314,7 @@ public class ServiceComponentResponse {
result = 71 * result + (serviceGroupName != null ? serviceGroupName.hashCode() : 0);
result = 71 * result + (serviceId != null ? serviceId.hashCode() : 0);
result = 71 * result + (serviceName != null ? serviceName.hashCode() : 0);
- result = 71 * result + (serviceDisplayName != null ? serviceDisplayName.hashCode() : 0);
+ result = 71 * result + (serviceType != null ? serviceType.hashCode() : 0);
result = 71 * result + (componentName != null ? componentName.hashCode():0);
result = 71 * result + (displayName != null ? displayName.hashCode():0);
return result;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceRequest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceRequest.java
index 59a700e..70e5240 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceRequest.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceRequest.java
@@ -26,7 +26,7 @@ public class ServiceRequest {
private String clusterName; // REF
private String serviceName; // GET/CREATE/DELETE
- private String serviceDisplayName; // GET/CREATE/UPDATE/DELETE
+ private String serviceType; // GET/CREATE/UPDATE/DELETE
private String serviceGroupName;
private String desiredState; // CREATE/UPDATE
private String maintenanceState; // UPDATE
@@ -49,7 +49,7 @@ public class ServiceRequest {
public ServiceRequest(String clusterName,
String serviceGroupName,
String serviceName,
- String serviceDisplayName,
+ String serviceType,
Long desiredRepositoryVersionId,
String desiredState,
String credentialStoreEnabled,
@@ -61,7 +61,7 @@ public class ServiceRequest {
this.desiredRepositoryVersionId = desiredRepositoryVersionId;
- this.serviceDisplayName = serviceDisplayName;
+ this.serviceType = serviceType;
this.desiredState = desiredState;
this.credentialStoreEnabled = credentialStoreEnabled;
// Credential store supported cannot be changed after
@@ -77,20 +77,20 @@ public class ServiceRequest {
public String getServiceName() { return serviceName; }
/**
- * @param serviceName the Service Display Name to set
+ * @param serviceName the service name to set
*/
public void setServiceName(String serviceName) { this.serviceName = serviceName; }
/**
- * @return the service display name
+ * @return the service type
*/
- @ApiModelProperty(name = "service_display_name")
- public String getServiceDisplayName() { return serviceDisplayName; }
+ @ApiModelProperty(name = "service_type")
+ public String getServiceType() { return serviceType; }
/**
- * @param serviceDisplayName the Service Display Name to set
+ * @param serviceType the service type to set
*/
- public void setServiceDisplayName(String serviceDisplayName) { this.serviceDisplayName = serviceDisplayName; }
+ public void setServiceType(String serviceType) { this.serviceType = serviceType; }
/**
* @return the service group Name
@@ -181,7 +181,7 @@ public class ServiceRequest {
StringBuilder sb = new StringBuilder();
sb.append("clusterName=" + clusterName
+ ", serviceGroupName=" + serviceGroupName
- + ", serviceDisplayName=" + serviceDisplayName
+ + ", serviceName=" + serviceName
+ ", desiredState=" + desiredState
+ ", maintenanceState=" + maintenanceState
+ ", credentialStoreEnabled=" + credentialStoreEnabled
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceResponse.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceResponse.java
index f528b4e..73a2c93 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceResponse.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceResponse.java
@@ -31,7 +31,7 @@ public class ServiceResponse {
private String serviceGroupName;
private Long serviceId;
private String serviceName;
- private String serviceDisplayName;
+ private String serviceType;
private StackId desiredStackId;
private String desiredRepositoryVersion;
private Long desiredRepositoryVersionId;
@@ -42,7 +42,7 @@ public class ServiceResponse {
private boolean credentialStoreEnabled;
public ServiceResponse(Long clusterId, String clusterName, Long serviceGroupId, String serviceGroupName,
- Long serviceId, String serviceName, String serviceDisplayName, StackId desiredStackId,
+ Long serviceId, String serviceName, String serviceType, StackId desiredStackId,
String desiredRepositoryVersion, RepositoryVersionState repositoryVersionState, String desiredState,
boolean credentialStoreSupported, boolean credentialStoreEnabled) {
this.clusterId = clusterId;
@@ -51,7 +51,7 @@ public class ServiceResponse {
this.serviceGroupName = serviceGroupName;
this.serviceId = serviceId;
this.serviceName = serviceName;
- this.serviceDisplayName = serviceDisplayName;
+ this.serviceType = serviceType;
this.desiredStackId = desiredStackId;
this.repositoryVersionState = repositoryVersionState;
setDesiredState(desiredState);
@@ -137,14 +137,14 @@ public class ServiceResponse {
public void setServiceId(Long serviceId) { this.serviceId = serviceId; }
/**
- * @return the real serviceName
+ * @return the serviceType (i.e. stack service name)
*/
- public String getServiceDisplayName() { return serviceDisplayName; }
+ public String getServiceType() { return serviceType; }
/**
- * @param serviceDisplayName the real serviceName to set
+ * @param serviceType the serviceType (i.e. stack service name) to set
*/
- public void setserviceDisplayName(String serviceDisplayName) { this.serviceDisplayName = serviceDisplayName; }
+ public void setServiceType(String serviceType) { this.serviceType = serviceType; }
/**
* @return the desiredState
@@ -220,8 +220,8 @@ public class ServiceResponse {
!serviceName.equals(that.serviceName) : that.serviceName != null) {
return false;
}
- if (serviceDisplayName != null ?
- !serviceDisplayName.equals(that.serviceDisplayName) : that.serviceDisplayName != null) {
+ if (serviceType != null ?
+ !serviceType.equals(that.serviceType) : that.serviceType != null) {
return false;
}
@@ -287,7 +287,7 @@ public class ServiceResponse {
result = 71 * result + (serviceGroupName != null ? serviceGroupName.hashCode() : 0);
result = 71 * result + (serviceId != null ? serviceId.hashCode() : 0);
result = 71 * result + (serviceName != null ? serviceName.hashCode() : 0);
- result = 71 * result + (serviceDisplayName != null ? serviceDisplayName.hashCode() : 0);
+ result = 71 * result + (serviceType != null ? serviceType.hashCode() : 0);
return result;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/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 ef34c6a..652d667 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
@@ -200,7 +200,7 @@ public class ClientConfigResourceProvider extends AbstractControllerResourceProv
ServiceComponentHostRequest schRequest = requests.iterator().next();
String requestComponentName = schRequest.getComponentName();
- String requestServiceName = schRequest.getServiceDisplayName();
+ String requestServiceName = schRequest.getServiceName();
String requestHostName = schRequest.getHostname();
Map<String,List<ServiceComponentHostResponse>> serviceToComponentMap = new HashMap<>();
[2/3] ambari git commit: AMBARI-22164: Update services API to user
service_name, service_type instead of service_display_name,
service_name (jluniya)
Posted by jl...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/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 c01b901..f7559c6 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
@@ -88,7 +88,7 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
protected static final String COMPONENT_SERVICE_GROUP_NAME_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "service_group_name";
protected static final String COMPONENT_SERVICE_ID_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "service_id";
protected static final String COMPONENT_SERVICE_NAME_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "service_name";
- protected static final String COMPONENT_SERVICE_DISPLAY_NAME_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "service_display_name";
+ protected static final String COMPONENT_SERVICE_TYPE_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "service_type";
protected static final String COMPONENT_COMPONENT_NAME_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "component_name";
protected static final String COMPONENT_DISPLAY_NAME_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "display_name";
protected static final String COMPONENT_STATE_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "state";
@@ -114,7 +114,7 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
private static Set<String> pkPropertyIds = Sets.newHashSet(
COMPONENT_CLUSTER_NAME_PROPERTY_ID,
COMPONENT_SERVICE_GROUP_NAME_PROPERTY_ID,
- COMPONENT_SERVICE_DISPLAY_NAME_PROPERTY_ID,
+ COMPONENT_SERVICE_NAME_PROPERTY_ID,
COMPONENT_COMPONENT_NAME_PROPERTY_ID);
/**
@@ -135,7 +135,7 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
PROPERTY_IDS.add(COMPONENT_SERVICE_GROUP_NAME_PROPERTY_ID);
PROPERTY_IDS.add(COMPONENT_SERVICE_ID_PROPERTY_ID);
PROPERTY_IDS.add(COMPONENT_SERVICE_NAME_PROPERTY_ID);
- PROPERTY_IDS.add(COMPONENT_SERVICE_DISPLAY_NAME_PROPERTY_ID);
+ PROPERTY_IDS.add(COMPONENT_SERVICE_TYPE_PROPERTY_ID);
PROPERTY_IDS.add(COMPONENT_COMPONENT_NAME_PROPERTY_ID);
PROPERTY_IDS.add(COMPONENT_DISPLAY_NAME_PROPERTY_ID);
PROPERTY_IDS.add(COMPONENT_STATE_PROPERTY_ID);
@@ -158,7 +158,7 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
// keys
KEY_PROPERTY_IDS.put(Resource.Type.Component, COMPONENT_COMPONENT_NAME_PROPERTY_ID);
KEY_PROPERTY_IDS.put(Resource.Type.ServiceGroup, COMPONENT_SERVICE_GROUP_NAME_PROPERTY_ID);
- KEY_PROPERTY_IDS.put(Resource.Type.Service, COMPONENT_SERVICE_DISPLAY_NAME_PROPERTY_ID);
+ KEY_PROPERTY_IDS.put(Resource.Type.Service, COMPONENT_SERVICE_NAME_PROPERTY_ID);
KEY_PROPERTY_IDS.put(Resource.Type.Cluster, COMPONENT_CLUSTER_NAME_PROPERTY_ID);
}
@@ -217,7 +217,7 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
resource.setProperty(COMPONENT_SERVICE_GROUP_NAME_PROPERTY_ID, response.getServiceGroupName());
resource.setProperty(COMPONENT_SERVICE_ID_PROPERTY_ID, response.getServiceId());
resource.setProperty(COMPONENT_SERVICE_NAME_PROPERTY_ID, response.getServiceName());
- resource.setProperty(COMPONENT_SERVICE_DISPLAY_NAME_PROPERTY_ID, response.getServiceDisplayName());
+ resource.setProperty(COMPONENT_SERVICE_TYPE_PROPERTY_ID, response.getServiceType());
resource.setProperty(COMPONENT_COMPONENT_NAME_PROPERTY_ID, response.getComponentName());
resource.setProperty(COMPONENT_DISPLAY_NAME_PROPERTY_ID, response.getDisplayName());
resource.setProperty(COMPONENT_STATE_PROPERTY_ID, response.getDesiredState());
@@ -264,7 +264,7 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
setResourceProperty(resource, COMPONENT_SERVICE_GROUP_NAME_PROPERTY_ID, response.getServiceGroupName(), requestedIds);
setResourceProperty(resource, COMPONENT_SERVICE_ID_PROPERTY_ID, response.getServiceId(), requestedIds);
setResourceProperty(resource, COMPONENT_SERVICE_NAME_PROPERTY_ID, response.getServiceName(), requestedIds);
- setResourceProperty(resource, COMPONENT_SERVICE_DISPLAY_NAME_PROPERTY_ID, response.getServiceDisplayName(), requestedIds);
+ setResourceProperty(resource, COMPONENT_SERVICE_TYPE_PROPERTY_ID, response.getServiceType(), requestedIds);
setResourceProperty(resource, COMPONENT_COMPONENT_NAME_PROPERTY_ID, response.getComponentName(), requestedIds);
setResourceProperty(resource, COMPONENT_DISPLAY_NAME_PROPERTY_ID, response.getDisplayName(), requestedIds);
setResourceProperty(resource, COMPONENT_STATE_PROPERTY_ID, response.getDesiredState(), requestedIds);
@@ -356,7 +356,7 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
return new ServiceComponentRequest(
(String) properties.get(COMPONENT_CLUSTER_NAME_PROPERTY_ID),
(String) properties.get(COMPONENT_SERVICE_GROUP_NAME_PROPERTY_ID),
- (String) properties.get(COMPONENT_SERVICE_DISPLAY_NAME_PROPERTY_ID),
+ (String) properties.get(COMPONENT_SERVICE_NAME_PROPERTY_ID),
(String) properties.get(COMPONENT_COMPONENT_NAME_PROPERTY_ID),
(String) properties.get(COMPONENT_STATE_PROPERTY_ID),
(String) properties.get(COMPONENT_RECOVERY_ENABLED_ID),
@@ -384,7 +384,7 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
for (ServiceComponentRequest request : requests) {
Validate.notEmpty(request.getComponentName(), "component name should be non-empty");
Validate.notEmpty(request.getServiceGroupName(), "service group name should be non-empty");
- Validate.notEmpty(request.getServiceDisplayName(), "service display name should be non-empty");
+ Validate.notEmpty(request.getServiceName(), "service name should be non-empty");
Cluster cluster = getClusterForRequest(request, clusters);
isAuthorized(cluster, getRequiredCreateAuthorizations());
@@ -396,16 +396,16 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
}
Map<String, Set<String>> serviceComponents = componentNames.get(request.getClusterName());
- if (!serviceComponents.containsKey(request.getServiceDisplayName())) {
- serviceComponents.put(request.getServiceDisplayName(), new HashSet<String>());
+ if (!serviceComponents.containsKey(request.getServiceName())) {
+ serviceComponents.put(request.getServiceName(), new HashSet<String>());
}
- if (serviceComponents.get(request.getServiceDisplayName()).contains(request.getComponentName())) {
+ if (serviceComponents.get(request.getServiceName()).contains(request.getComponentName())) {
// throw error later for dup
duplicates.add(request.toString());
continue;
}
- serviceComponents.get(request.getServiceDisplayName()).add(request.getComponentName());
+ serviceComponents.get(request.getServiceName()).add(request.getComponentName());
if (StringUtils.isNotEmpty(request.getDesiredState())) {
Validate.isTrue(State.INIT == State.valueOf(request.getDesiredState()),
@@ -427,7 +427,7 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
StackId stackId = s.getDesiredStackId();
if (!ambariMetaInfo.isValidServiceComponent(stackId.getStackName(),
- stackId.getStackVersion(), s.getName(), request.getComponentName())) {
+ stackId.getStackVersion(), s.getServiceType(), request.getComponentName())) {
throw new IllegalArgumentException("Unsupported or invalid component"
+ " in stack stackInfo=" + stackId.getStackId()
+ " request=" + request);
@@ -448,7 +448,7 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
// now doing actual work
for (ServiceComponentRequest request : requests) {
Cluster cluster = clusters.getCluster(request.getClusterName());
- Service s = cluster.getService(request.getServiceDisplayName());
+ Service s = cluster.getService(request.getServiceName());
ServiceComponent sc = serviceComponentFactory.createNew(s, request.getComponentName());
sc.setDesiredRepositoryVersion(s.getDesiredRepositoryVersion());
@@ -545,7 +545,7 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
}
Set<Service> services = new HashSet<>();
- if (StringUtils.isNotEmpty(request.getServiceDisplayName())) {
+ if (StringUtils.isNotEmpty(request.getServiceName())) {
services.add(getServiceFromCluster(request, cluster));
} else {
services.addAll(cluster.getServices().values());
@@ -624,7 +624,7 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
final Cluster cluster = getClusterForRequest(request, clusters);
final String clusterName = request.getClusterName();
final String serviceGroupName = request.getServiceGroupName();
- final String serviceName = request.getServiceDisplayName();
+ final String serviceName = request.getServiceName();
final String componentName = request.getComponentName();
LOG.info("Received a updateComponent request: {}", request);
@@ -876,7 +876,7 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
private Service getServiceFromCluster(final ServiceComponentRequest request, final Cluster cluster) throws AmbariException {
try {
- return cluster.getService(request.getServiceDisplayName());
+ return cluster.getService(request.getServiceName());
} catch (ServiceNotFoundException e) {
throw new ParentObjectNotFoundException("Parent Service resource doesn't exist.", e);
}
@@ -906,7 +906,7 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
private void setServiceNameIfAbsent(final ServiceComponentRequest request,
final Cluster cluster,
final AmbariMetaInfo ambariMetaInfo) throws AmbariException {
- if (StringUtils.isEmpty(request.getServiceDisplayName())) {
+ if (StringUtils.isEmpty(request.getServiceName())) {
String componentName = request.getComponentName();
@@ -919,7 +919,7 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
+ ", componentName=" + request.getComponentName()
+ ", clusterName=" + cluster.getClusterName());
}
- request.setServiceDisplayName(serviceName);
+ request.setServiceName(serviceName);
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
index 2e303fd..8f1dc7c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
@@ -89,7 +89,7 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro
public static final String HOST_COMPONENT_SERVICE_GROUP_NAME_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "service_group_name";
public static final String HOST_COMPONENT_SERVICE_ID_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "service_id";
public static final String HOST_COMPONENT_SERVICE_NAME_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "service_name";
- public static final String HOST_COMPONENT_SERVICE_DISPLAY_NAME_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "service_display_name";
+ public static final String HOST_COMPONENT_SERVICE_TYPE_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "service_type";
public static final String HOST_COMPONENT_HOST_COMPONENT_ID_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "id";
public static final String HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "component_name";
public static final String HOST_COMPONENT_DISPLAY_NAME_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "display_name";
@@ -112,7 +112,7 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro
new HashSet<>(Arrays.asList(new String[]{
HOST_COMPONENT_CLUSTER_NAME_PROPERTY_ID,
HOST_COMPONENT_SERVICE_GROUP_NAME_PROPERTY_ID,
- HOST_COMPONENT_SERVICE_DISPLAY_NAME_PROPERTY_ID,
+ HOST_COMPONENT_SERVICE_NAME_PROPERTY_ID,
HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID,
HOST_COMPONENT_HOST_NAME_PROPERTY_ID}));
@@ -180,7 +180,7 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro
resource.setProperty(HOST_COMPONENT_SERVICE_GROUP_NAME_PROPERTY_ID, response.getServiceGroupName());
resource.setProperty(HOST_COMPONENT_SERVICE_ID_PROPERTY_ID, response.getServiceId());
resource.setProperty(HOST_COMPONENT_SERVICE_NAME_PROPERTY_ID, response.getServiceName());
- resource.setProperty(HOST_COMPONENT_SERVICE_DISPLAY_NAME_PROPERTY_ID, response.getServiceDisplayName());
+ resource.setProperty(HOST_COMPONENT_SERVICE_TYPE_PROPERTY_ID, response.getServiceType());
resource.setProperty(HOST_COMPONENT_HOST_COMPONENT_ID_PROPERTY_ID, response.getHostComponentId());
resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, response.getComponentName());
resource.setProperty(HOST_COMPONENT_DISPLAY_NAME_PROPERTY_ID, response.getDisplayName());
@@ -252,7 +252,7 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro
setResourceProperty(resource, HOST_COMPONENT_SERVICE_GROUP_NAME_PROPERTY_ID, response.getServiceGroupName(), requestedIds);
setResourceProperty(resource, HOST_COMPONENT_SERVICE_ID_PROPERTY_ID, response.getServiceId(), requestedIds);
setResourceProperty(resource, HOST_COMPONENT_SERVICE_NAME_PROPERTY_ID, response.getServiceName(), requestedIds);
- setResourceProperty(resource, HOST_COMPONENT_SERVICE_DISPLAY_NAME_PROPERTY_ID, response.getServiceDisplayName(), requestedIds);
+ setResourceProperty(resource, HOST_COMPONENT_SERVICE_TYPE_PROPERTY_ID, response.getServiceType(), requestedIds);
setResourceProperty(resource, HOST_COMPONENT_HOST_COMPONENT_ID_PROPERTY_ID, response.getHostComponentId(), requestedIds);
setResourceProperty(resource, HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, response.getComponentName(), requestedIds);
setResourceProperty(resource, HOST_COMPONENT_DISPLAY_NAME_PROPERTY_ID, response.getDisplayName(), requestedIds);
@@ -520,12 +520,12 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro
}
}
- if (StringUtils.isEmpty(request.getServiceDisplayName())) {
- request.setServiceDisplayName(getManagementController().findService(cluster, request.getComponentName()));
+ if (StringUtils.isEmpty(request.getServiceName())) {
+ request.setServiceName(getManagementController().findService(cluster, request.getComponentName()));
}
ServiceComponent sc = getServiceComponent(
- request.getClusterName(), request.getServiceGroupName(), request.getServiceDisplayName(), request.getComponentName());
+ request.getClusterName(), request.getServiceGroupName(), request.getServiceName(), request.getComponentName());
logRequestInfo("Received a updateHostComponent request", request);
@@ -547,10 +547,10 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro
requestClusters.put(request.getClusterName(), clusterServices);
}
- Map<String, Set<String>> serviceComponents = clusterServices.get(request.getServiceDisplayName());
+ Map<String, Set<String>> serviceComponents = clusterServices.get(request.getServiceName());
if (serviceComponents == null) {
serviceComponents = new HashMap<>();
- clusterServices.put(request.getServiceDisplayName(), serviceComponents);
+ clusterServices.put(request.getServiceName(), serviceComponents);
}
Set<String> componentHosts = serviceComponents.get(request.getComponentName());
@@ -730,7 +730,7 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro
ServiceComponentHostRequest serviceComponentHostRequest = new ServiceComponentHostRequest(
(String) properties.get(HOST_COMPONENT_CLUSTER_NAME_PROPERTY_ID),
(String) properties.get(HOST_COMPONENT_SERVICE_GROUP_NAME_PROPERTY_ID),
- (String) properties.get(HOST_COMPONENT_SERVICE_DISPLAY_NAME_PROPERTY_ID),
+ (String) properties.get(HOST_COMPONENT_SERVICE_NAME_PROPERTY_ID),
(String) properties.get(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID),
(String) properties.get(HOST_COMPONENT_HOST_NAME_PROPERTY_ID),
(String) properties.get(HOST_COMPONENT_STATE_PROPERTY_ID));
@@ -947,12 +947,11 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro
* @param request the request to log
*/
private void logRequestInfo(String msg, ServiceComponentHostRequest request) {
- LOG.info("{}, clusterName={}, serviceGroupName={}, serviceName={}, serviceDisplayName={}, componentName={}, hostname={}, request={}",
+ LOG.info("{}, clusterName={}, serviceGroupName={}, serviceName={}, componentName={}, hostname={}, request={}",
msg,
request.getClusterName(),
request.getServiceGroupName(),
- request.getServiceDisplayName(),
- request.getServiceDisplayName(),
+ request.getServiceName(),
request.getComponentName(),
request.getHostname(),
request);
@@ -971,8 +970,7 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro
sb.append(msg)
.append(", clusterName=").append(request.getClusterName())
.append(", serviceGroupName=").append(request.getServiceGroupName())
- .append(", serviceName=").append(request.getServiceDisplayName())
- .append(", serviceDisplayName=").append(request.getServiceDisplayName())
+ .append(", serviceName=").append(request.getServiceName())
.append(", componentName=").append(request.getComponentName())
.append(", hostname=").append(request.getHostname())
.append(", currentState=").append(oldState == null ? "null" : oldState)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/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 f8eb878..252d772 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
@@ -97,7 +97,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
public static final String SERVICE_SERVICE_GROUP_NAME_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "service_group_name";
public static final String SERVICE_SERVICE_ID_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "service_id";
public static final String SERVICE_SERVICE_NAME_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "service_name";
- public static final String SERVICE_SERVICE_DISPLAY_NAME_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "service_display_name";
+ public static final String SERVICE_SERVICE_TYPE_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "service_type";
public static final String SERVICE_SERVICE_STATE_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "state";
public static final String SERVICE_MAINTENANCE_STATE_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "maintenance_state";
public static final String SERVICE_CREDENTIAL_STORE_SUPPORTED_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "credential_store_supported";
@@ -116,7 +116,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
new HashSet<>(Arrays.asList(new String[]{
SERVICE_CLUSTER_NAME_PROPERTY_ID,
SERVICE_SERVICE_GROUP_NAME_PROPERTY_ID,
- SERVICE_SERVICE_DISPLAY_NAME_PROPERTY_ID}));
+ SERVICE_SERVICE_NAME_PROPERTY_ID}));
/**
* The property ids for an service resource.
@@ -136,7 +136,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
PROPERTY_IDS.add(SERVICE_SERVICE_GROUP_NAME_PROPERTY_ID);
PROPERTY_IDS.add(SERVICE_SERVICE_ID_PROPERTY_ID);
PROPERTY_IDS.add(SERVICE_SERVICE_NAME_PROPERTY_ID);
- PROPERTY_IDS.add(SERVICE_SERVICE_DISPLAY_NAME_PROPERTY_ID);
+ PROPERTY_IDS.add(SERVICE_SERVICE_TYPE_PROPERTY_ID);
PROPERTY_IDS.add(SERVICE_SERVICE_STATE_PROPERTY_ID);
PROPERTY_IDS.add(SERVICE_MAINTENANCE_STATE_PROPERTY_ID);
PROPERTY_IDS.add(SERVICE_CREDENTIAL_STORE_SUPPORTED_PROPERTY_ID);
@@ -151,7 +151,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
PROPERTY_IDS.add(QUERY_PARAMETERS_START_DEPENDENCIES);
// keys
- KEY_PROPERTY_IDS.put(Resource.Type.Service, SERVICE_SERVICE_DISPLAY_NAME_PROPERTY_ID);
+ KEY_PROPERTY_IDS.put(Resource.Type.Service, SERVICE_SERVICE_NAME_PROPERTY_ID);
KEY_PROPERTY_IDS.put(Resource.Type.ServiceGroup, SERVICE_SERVICE_GROUP_NAME_PROPERTY_ID);
KEY_PROPERTY_IDS.put(Resource.Type.Cluster, SERVICE_CLUSTER_NAME_PROPERTY_ID);
}
@@ -223,7 +223,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
resource.setProperty(SERVICE_SERVICE_GROUP_NAME_PROPERTY_ID, response.getServiceGroupName());
resource.setProperty(SERVICE_SERVICE_ID_PROPERTY_ID, response.getServiceId());
resource.setProperty(SERVICE_SERVICE_NAME_PROPERTY_ID, response.getServiceName());
- resource.setProperty(SERVICE_SERVICE_DISPLAY_NAME_PROPERTY_ID, response.getServiceDisplayName());
+ resource.setProperty(SERVICE_SERVICE_TYPE_PROPERTY_ID, response.getServiceType());
resource.setProperty(SERVICE_SERVICE_STATE_PROPERTY_ID, response.getDesiredState());
resource.setProperty(SERVICE_MAINTENANCE_STATE_PROPERTY_ID, response.getMaintenanceState());
resource.setProperty(SERVICE_DESIRED_REPO_VERSION_ID_PROPERTY_ID, response.getDesiredRepositoryVersion());
@@ -273,8 +273,8 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
response.getServiceId(), requestedIds);
setResourceProperty(resource, SERVICE_SERVICE_NAME_PROPERTY_ID,
response.getServiceName(), requestedIds);
- setResourceProperty(resource, SERVICE_SERVICE_DISPLAY_NAME_PROPERTY_ID,
- response.getServiceDisplayName(), requestedIds);
+ setResourceProperty(resource, SERVICE_SERVICE_TYPE_PROPERTY_ID,
+ response.getServiceType(), requestedIds);
setResourceProperty(resource, SERVICE_SERVICE_STATE_PROPERTY_ID,
calculateServiceState(response.getClusterName(), response.getServiceName()),
requestedIds);
@@ -350,7 +350,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
notifyDelete(Resource.Type.Service, predicate);
for(ServiceRequest serviceReq : requests) {
- deleteStatusMetaData.addDeletedKey("service_name: "+serviceReq.getServiceDisplayName());
+ deleteStatusMetaData.addDeletedKey("service_name: " + serviceReq.getServiceName());
}
return getRequestStatus(null, null, deleteStatusMetaData);
}
@@ -433,7 +433,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
(String) properties.get(SERVICE_CLUSTER_NAME_PROPERTY_ID),
(String) properties.get(SERVICE_SERVICE_GROUP_NAME_PROPERTY_ID),
(String) properties.get(SERVICE_SERVICE_NAME_PROPERTY_ID),
- (String) properties.get(SERVICE_SERVICE_DISPLAY_NAME_PROPERTY_ID),
+ (String) properties.get(SERVICE_SERVICE_TYPE_PROPERTY_ID),
null == desiredRepoId ? null : Long.valueOf(desiredRepoId),
(String) properties.get(SERVICE_SERVICE_STATE_PROPERTY_ID),
(String) properties.get(SERVICE_CREDENTIAL_STORE_ENABLED_PROPERTY_ID),
@@ -470,8 +470,8 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
Cluster cluster = clusters.getCluster(request.getClusterName());
ServiceGroup sg = cluster.getServiceGroup(request.getServiceGroupName());
- if(StringUtils.isBlank(request.getServiceDisplayName())) {
- request.setServiceDisplayName(request.getServiceName());
+ if(StringUtils.isBlank(request.getServiceType())) {
+ request.setServiceType(request.getServiceName());
}
RepositoryVersionEntity repositoryVersion = request.getResolvedRepository();
@@ -480,7 +480,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
throw new AmbariException("Could not find any repository on the request.");
}
- Service s = cluster.addService(sg, request.getServiceName(), request.getServiceName(), repositoryVersion);
+ Service s = cluster.addService(sg, request.getServiceName(), request.getServiceType(), repositoryVersion);
if (repositoryVersion.getType() != RepositoryType.STANDARD
&& cluster.getProvisioningState() == State.INIT) {
throw new AmbariException(String.format(
@@ -495,13 +495,13 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
StackId stackId = repositoryVersion.getStackId();
AmbariMetaInfo ambariMetaInfo = getManagementController().getAmbariMetaInfo();
ServiceInfo serviceInfo = ambariMetaInfo.getService(stackId.getStackName(),
- stackId.getStackVersion(), request.getServiceDisplayName());
+ stackId.getStackVersion(), request.getServiceType());
boolean credentialStoreSupported = serviceInfo.isCredentialStoreSupported();
boolean credentialStoreRequired = serviceInfo.isCredentialStoreRequired();
- LOG.info("Service: {}, credential_store_supported = {} and credential_store_required = {} from stack definition",
- request.getServiceDisplayName(), credentialStoreSupported, credentialStoreRequired);
+ LOG.info("Service: service_name = {}, service_type = {}, credential_store_supported = {} and credential_store_required = {} from stack definition",
+ request.getServiceName(), request.getServiceType(), credentialStoreSupported, credentialStoreRequired);
/*
* If request does not have credential_store_enabled field,
* then get the default from the stack definition.
@@ -510,16 +510,16 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
boolean credentialStoreEnabled = Boolean.parseBoolean(request.getCredentialStoreEnabled());
boolean enableCredStore = credentialStoreSupported && (credentialStoreRequired || credentialStoreEnabled);
s.setCredentialStoreEnabled(enableCredStore);
- LOG.info("Service: {}, credential_store_enabled = {} from request and resulting" +
+ LOG.info("Service: service_name = {}, service_type = {}, credential_store_enabled = {} from request and resulting" +
" credential store enabled status is = {}",
- request.getServiceDisplayName(), credentialStoreEnabled, enableCredStore);
+ request.getServiceName(), request.getServiceType(), credentialStoreEnabled, enableCredStore);
} else {
boolean enableCredStore = credentialStoreSupported &&
(credentialStoreRequired || serviceInfo.isCredentialStoreEnabled());
s.setCredentialStoreEnabled(enableCredStore);
- LOG.info("Service: {}, credential_store_enabled = {} from stack definition and resulting" +
+ LOG.info("Service: service_name = {}, service_type = {}, credential_store_enabled = {} from stack definition and resulting" +
" credential store enabled status is = {}",
- s.getServiceDisplayName(), serviceInfo.isCredentialStoreEnabled(), enableCredStore);
+ s.getName(), s.getServiceType(), serviceInfo.isCredentialStoreEnabled(), enableCredStore);
}
// Initialize service widgets
@@ -565,8 +565,8 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
}
Set<ServiceResponse> response = new HashSet<>();
- if (request.getServiceDisplayName() != null) {
- Service s = cluster.getService(request.getServiceDisplayName());
+ if (request.getServiceName() != null) {
+ Service s = cluster.getService(request.getServiceName());
response.add(s.convertToResponse());
return response;
}
@@ -599,10 +599,10 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
String retrivedSvcGrp = serviceResponse.getServiceGroupName();
if (retrivedSvcGrp == null) {
throw new NullPointerException("'ServiceGroupName' : null in cluster : " + cluster.getClusterName() +
- " for retrieved Service : "+s.getServiceDisplayName());
+ " for retrieved Service : "+s.getServiceName());
}
if (!retrivedSvcGrp.equals(request.getServiceGroupName())) {
- throw new ServiceNotFoundException(cluster.getClusterName(), s.getServiceDisplayName());
+ throw new ServiceNotFoundException(cluster.getClusterName(), s.getServiceName());
}
*/
response.add(serviceResponse);
@@ -656,15 +656,15 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
for (ServiceRequest request : requests) {
if (request.getClusterName() == null
|| request.getClusterName().isEmpty()
- || request.getServiceDisplayName() == null
- || request.getServiceDisplayName().isEmpty()) {
+ || request.getServiceName() == null
+ || request.getServiceName().isEmpty()) {
throw new IllegalArgumentException("Invalid arguments, cluster name"
- + " and/or service display name should be provided to update services");
+ + " and/or service name should be provided to update services");
}
LOG.info("Received a updateService request"
+ ", clusterName=" + request.getClusterName()
- + ", serviceName=" + request.getServiceDisplayName()
+ + ", serviceName=" + request.getServiceName()
+ ", request=" + request);
clusterIds.add(request.getClusterName());
@@ -679,15 +679,15 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
}
if (serviceNames.get(request.getClusterName())
- .contains(request.getServiceDisplayName())) {
+ .contains(request.getServiceName())) {
// TODO throw single exception
throw new IllegalArgumentException("Invalid request contains duplicate"
+ " service names");
}
- serviceNames.get(request.getClusterName()).add(request.getServiceDisplayName());
+ serviceNames.get(request.getClusterName()).add(request.getServiceName());
Cluster cluster = clusters.getCluster(request.getClusterName());
- Service s = cluster.getService(request.getServiceDisplayName());
+ Service s = cluster.getService(request.getServiceName());
State oldState = s.getDesiredState();
State newState = null;
if (request.getDesiredState() != null) {
@@ -735,8 +735,8 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
"as it is required by the service. Service=" + s.getName());
}
serviceCredentialStoreEnabledMap.put(s, credentialStoreEnabled);
- LOG.info("Service: {}, credential_store_enabled from request: {}", request.getServiceDisplayName(),
- credentialStoreEnabled);
+ LOG.info("Service: service_name = {}, service_type = {}, credential_store_enabled from request: {}",
+ request.getServiceName(), request.getServiceType(), credentialStoreEnabled);
}
if (StringUtils.isNotEmpty(request.getCredentialStoreSupported())) {
@@ -747,7 +747,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
if (newState == null) {
if (LOG.isDebugEnabled()) {
LOG.debug("Nothing to do for new updateService request, clusterId={}, serviceName={}, newDesiredState=null",
- request.getClusterName(), request.getServiceDisplayName());
+ request.getClusterName(), request.getServiceName());
}
continue;
}
@@ -952,7 +952,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
Set<Service> removable = new HashSet<>();
for (ServiceRequest serviceRequest : request) {
- if (StringUtils.isEmpty(serviceRequest.getClusterName()) || StringUtils.isEmpty(serviceRequest.getServiceDisplayName())) {
+ if (StringUtils.isEmpty(serviceRequest.getClusterName()) || StringUtils.isEmpty(serviceRequest.getServiceName())) {
// FIXME throw correct error
throw new AmbariException("invalid arguments");
} else {
@@ -963,7 +963,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
Service service = clusters.getCluster(
serviceRequest.getClusterName()).getService(
- serviceRequest.getServiceDisplayName());
+ serviceRequest.getServiceName());
//
// Run through the list of service component hosts. If all host components are in removable state,
@@ -977,7 +977,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
for (Map.Entry<String, ServiceComponentHost> entry : schHostMap.entrySet()) {
ServiceComponentHost sch = entry.getValue();
if (!sch.canBeRemoved()) {
- String msg = "Cannot remove " + serviceRequest.getClusterName() + "/" + serviceRequest.getServiceDisplayName() +
+ String msg = "Cannot remove " + serviceRequest.getClusterName() + "/" + serviceRequest.getServiceName() +
". " + sch.getServiceComponentName() + "on " + sch.getHost() + " is in " +
String.valueOf(sch.getDesiredState()) + " state.";
LOG.error(msg);
@@ -988,7 +988,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
if (!isServiceRemovable) {
throw new AmbariException ("Cannot remove " +
- serviceRequest.getClusterName() + "/" + serviceRequest.getServiceDisplayName() +
+ serviceRequest.getClusterName() + "/" + serviceRequest.getServiceName() +
". " + "One or more host components are in a non-removable state.");
}
@@ -1081,21 +1081,18 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
throws AuthorizationException, AmbariException {
AmbariMetaInfo ambariMetaInfo = getManagementController().getAmbariMetaInfo();
- Map<String, Set<String>> serviceDisplayNames = new HashMap<>();
+ Map<String, Set<String>> serviceNames = new HashMap<>();
Set<String> duplicates = new HashSet<>();
for (ServiceRequest request : requests) {
final String clusterName = request.getClusterName();
final String serviceGroupName = request.getServiceGroupName();
final String serviceName = request.getServiceName();
- final String serviceDisplayName = request.getServiceDisplayName();
+ final String serviceType = request.getServiceType();
final StackId desiredStackId = request.getDesiredStackId();
Validate.notNull(clusterName, "Cluster name should be provided when creating a service");
Validate.notNull(serviceGroupName, "Service group name should be provided when creating a service");
Validate.notEmpty(serviceName, "Service name should be provided when creating a service");
- Validate.notEmpty(serviceDisplayName, "Service display name should be provided when creating a service");
- //Todo Add after UI is ready
- //Validate.notNull(desiredStackId, "Service display name should be provided when creating a service");
if (LOG.isDebugEnabled()) {
LOG.debug("Received a createService request, clusterId={}, serviceName={}, request={}", clusterName, serviceName, request);
@@ -1105,16 +1102,16 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
throw new AuthorizationException("The user is not authorized to create services");
}
- if (!serviceDisplayNames.containsKey(clusterName)) {
- serviceDisplayNames.put(clusterName, new HashSet<String>());
+ if (!serviceNames.containsKey(clusterName)) {
+ serviceNames.put(clusterName, new HashSet<String>());
}
- if (serviceDisplayNames.get(clusterName).contains(serviceDisplayName)) {
+ if (serviceNames.get(clusterName).contains(serviceName)) {
// throw error later for dup
- duplicates.add(serviceDisplayName);
+ duplicates.add(serviceName);
continue;
}
- serviceDisplayNames.get(clusterName).add(serviceDisplayName);
+ serviceNames.get(clusterName).add(serviceName);
if (StringUtils.isNotEmpty(request.getDesiredState())) {
State state = State.valueOf(request.getDesiredState());
@@ -1132,10 +1129,10 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
throw new ParentObjectNotFoundException("Attempted to add a service to a cluster which doesn't exist", e);
}
try {
- Service s = cluster.getService(serviceDisplayName);
+ Service s = cluster.getService(serviceName);
if (s != null) {
// throw error later for dup
- duplicates.add(serviceDisplayName);
+ duplicates.add(serviceName);
continue;
}
} catch (ServiceNotFoundException e) {
@@ -1195,26 +1192,31 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
request.setResolvedRepository(repositoryVersion);
+ String stackServiceName = serviceType;
+ if(StringUtils.isBlank(serviceType)) {
+ stackServiceName = serviceName;
+ }
if (!ambariMetaInfo.isValidService(stackId.getStackName(),
- stackId.getStackVersion(), request.getServiceDisplayName())) {
+ stackId.getStackVersion(), stackServiceName)) {
throw new IllegalArgumentException("Unsupported or invalid service in stack, clusterId=" + clusterName
- + ", serviceDisplayName=" + serviceDisplayName + ", stackInfo=" + stackId.getStackId());
+ + ", serviceName=" + serviceName + ", stackServiceName=" + stackServiceName
+ + ", stackInfo=" + stackId.getStackId());
}
// validate the credential store input provided
ServiceInfo serviceInfo = ambariMetaInfo.getService(stackId.getStackName(),
- stackId.getStackVersion(), request.getServiceDisplayName());
+ stackId.getStackVersion(), stackServiceName);
if (StringUtils.isNotEmpty(request.getCredentialStoreEnabled())) {
boolean credentialStoreEnabled = Boolean.parseBoolean(request.getCredentialStoreEnabled());
if (!serviceInfo.isCredentialStoreSupported() && credentialStoreEnabled) {
throw new IllegalArgumentException("Invalid arguments, cannot enable credential store " +
- "as it is not supported by the service. Service=" + request.getServiceDisplayName());
+ "as it is not supported by the service. Service=" + request.getServiceName());
}
}
}
// ensure only a single cluster update
- if (serviceDisplayNames.size() != 1) {
+ if (serviceNames.size() != 1) {
throw new IllegalArgumentException("Invalid arguments, updates allowed"
+ "on only one cluster at a time");
}
@@ -1223,7 +1225,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
if (!duplicates.isEmpty()) {
String clusterName = requests.iterator().next().getClusterName();
String msg = "Attempted to create a service which already exists: "
- + ", clusterName=" + clusterName + " serviceDisplayName=" + StringUtils.join(duplicates, ",");
+ + ", clusterName=" + clusterName + " serviceName=" + StringUtils.join(duplicates, ",");
throw new DuplicateResourceException(msg);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/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 93baefe..e3f4e1a 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
@@ -87,9 +87,9 @@ public class DatabaseChecker {
if (serviceDesiredStateEntity == null) {
checkPassed = false;
LOG.error(String.format("ServiceDesiredStateEntity is null for " +
- "ServiceComponentDesiredStateEntity, clusterName=%s, serviceDisplayName=%s, serviceName=%s ",
- clusterEntity.getClusterName(), clusterServiceEntity.getServiceDisplayName(),
- clusterServiceEntity.getServiceName()));
+ "ServiceComponentDesiredStateEntity, clusterName=%s, serviceName=%s, serviceType=%s ",
+ clusterEntity.getClusterName(), clusterServiceEntity.getServiceName(),
+ clusterServiceEntity.getServiceType()));
}
Collection<ServiceComponentDesiredStateEntity> scDesiredStateEntities =
clusterServiceEntity.getServiceComponentDesiredStateEntities();
@@ -97,9 +97,9 @@ public class DatabaseChecker {
scDesiredStateEntities.isEmpty()) {
checkPassed = false;
LOG.error(String.format("serviceComponentDesiredStateEntities is null or empty for " +
- "ServiceComponentDesiredStateEntity, clusterName=%s, serviceDisplayName=%s, serviceName=%s ",
- clusterEntity.getClusterName(), clusterServiceEntity.getServiceDisplayName(),
- clusterServiceEntity.getServiceName()));
+ "ServiceComponentDesiredStateEntity, clusterName=%s, serviceName=%s, serviceType=%s ",
+ clusterEntity.getClusterName(), clusterServiceEntity.getServiceName(),
+ clusterServiceEntity.getServiceType()));
} else {
for (ServiceComponentDesiredStateEntity scDesiredStateEnity : scDesiredStateEntities) {
@@ -121,28 +121,28 @@ public class DatabaseChecker {
if (schDesiredStateEntities == null) {
componentCheckFailed = true;
LOG.error(String.format("hostComponentDesiredStateEntities is null for " +
- "ServiceComponentDesiredStateEntity, clusterName=%s, serviceName=%s, serviceDisplayName=%s, componentName=%s ",
- clusterEntity.getClusterName(), clusterServiceEntity.getServiceName(), clusterServiceEntity.getServiceDisplayName(),
+ "ServiceComponentDesiredStateEntity, clusterName=%s, serviceName=%s, serviceType=%s, componentName=%s ",
+ clusterEntity.getClusterName(), clusterServiceEntity.getServiceName(), clusterServiceEntity.getServiceType(),
scDesiredStateEnity.getComponentName()));
} else if (!zeroCardinality && schDesiredStateEntities.isEmpty()) {
componentCheckFailed = true;
LOG.error(String.format("hostComponentDesiredStateEntities is empty for " +
- "ServiceComponentDesiredStateEntity, clusterName=%s, serviceName=%s, serviceDisplayName=%s, componentName=%s ",
- clusterEntity.getClusterName(), clusterServiceEntity.getServiceName(), clusterServiceEntity.getServiceDisplayName(),
+ "ServiceComponentDesiredStateEntity, clusterName=%s, serviceName=%s, serviceType=%s, componentName=%s ",
+ clusterEntity.getClusterName(), clusterServiceEntity.getServiceName(), clusterServiceEntity.getServiceType(),
scDesiredStateEnity.getComponentName()));
}
if (schStateEntities == null) {
componentCheckFailed = true;
LOG.error(String.format("hostComponentStateEntities is null for " +
- "ServiceComponentDesiredStateEntity, clusterName=%s, serviceName=%s, serviceDisplayName=%s, componentName=%s ",
- clusterEntity.getClusterName(), clusterServiceEntity.getServiceName(), clusterServiceEntity.getServiceDisplayName(),
+ "ServiceComponentDesiredStateEntity, clusterName=%s, serviceName=%s, serviceType=%s, componentName=%s ",
+ clusterEntity.getClusterName(), clusterServiceEntity.getServiceName(), clusterServiceEntity.getServiceType(),
scDesiredStateEnity.getComponentName()));
} else if (!zeroCardinality && schStateEntities.isEmpty()) {
componentCheckFailed = true;
LOG.error(String.format("hostComponentStateEntities is empty for " +
- "ServiceComponentDesiredStateEntity, clusterName=%s, serviceName=%s, serviceDisplayName=%s, componentName=%s ",
- clusterEntity.getClusterName(), clusterServiceEntity.getServiceName(), clusterServiceEntity.getServiceDisplayName(),
+ "ServiceComponentDesiredStateEntity, clusterName=%s, serviceName=%s, serviceType=%s, componentName=%s ",
+ clusterEntity.getClusterName(), clusterServiceEntity.getServiceName(), clusterServiceEntity.getServiceType(),
scDesiredStateEnity.getComponentName()));
}
@@ -151,8 +151,8 @@ public class DatabaseChecker {
checkPassed = false;
LOG.error(String.format("HostComponentStateEntities and HostComponentDesiredStateEntities " +
"tables must contain equal number of rows mapped to ServiceComponentDesiredStateEntity, " +
- "(clusterName=%s, serviceName=%s, serviceDisplayName=%s, componentName=%s) ", clusterEntity.getClusterName(),
- clusterServiceEntity.getServiceName(), clusterServiceEntity.getServiceDisplayName(), scDesiredStateEnity.getComponentName()));
+ "(clusterName=%s, serviceName=%s, serviceType=%s, componentName=%s) ", clusterEntity.getClusterName(),
+ clusterServiceEntity.getServiceName(), clusterServiceEntity.getServiceType(), scDesiredStateEnity.getComponentName()));
}
checkPassed = checkPassed && !componentCheckFailed;
}
@@ -231,26 +231,27 @@ public class DatabaseChecker {
for (ClusterServiceEntity clusterServiceEntity : clusterServiceEntities) {
if (!State.INIT.equals(
clusterServiceEntity.getServiceDesiredStateEntity().getDesiredState())) {
- String serviceDisplayName = clusterServiceEntity.getServiceDisplayName();
+ String serviceName = clusterServiceEntity.getServiceName();
+ String stackServiceName = clusterServiceEntity.getServiceType();
Long serviceGroupId = clusterServiceEntity.getServiceGroupId();
ServiceInfo serviceInfo = ambariMetaInfo.getService(stack.getName(),
- stack.getVersion(), serviceDisplayName);
+ stack.getVersion(), stackServiceName);
for (String configTypeName : serviceInfo.getConfigTypeAttributes().keySet()) {
if (selectedCountForType.get(configTypeName) == null) {
checkPassed = false;
LOG.error("Configuration {} is missing for service {}", configTypeName,
- serviceDisplayName);
+ serviceName);
} else {
// Check that for each config type exactly one is selected
if (selectedCountForType.get(configTypeName) == 0) {
checkPassed = false;
LOG.error("Configuration {} has no enabled entries for service {}",
- configTypeName, serviceDisplayName);
+ configTypeName, serviceName);
} else if (selectedCountForType.get(configTypeName) > 1) {
checkPassed = false;
LOG.error("Configuration {} has more than 1 enabled entry for service {}",
- configTypeName, serviceDisplayName);
+ configTypeName, serviceName);
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceComponentInstalledEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceComponentInstalledEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceComponentInstalledEvent.java
index 8c2e6d4..b0c39f5 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceComponentInstalledEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceComponentInstalledEvent.java
@@ -33,14 +33,15 @@ public class ServiceComponentInstalledEvent extends ServiceEvent {
* @param stackName
* @param stackVersion
* @param serviceName
+ * @param serviceType
* @param componentName
* @param hostName
*/
public ServiceComponentInstalledEvent(long clusterId, String stackName, String stackVersion, String serviceName,
- String serviceDisplayName, String serviceGroupName, String componentName,
+ String serviceType, String serviceGroupName, String componentName,
String hostName, boolean recoveryEnabled) {
super(AmbariEventType.SERVICE_COMPONENT_INSTALL_SUCCESS, clusterId, stackName,
- stackVersion, serviceName, serviceDisplayName, serviceGroupName);
+ stackVersion, serviceName, serviceType, serviceGroupName);
m_componentName = componentName;
m_hostName = hostName;
@@ -72,7 +73,7 @@ public class ServiceComponentInstalledEvent extends ServiceEvent {
buffer.append(", stackName=").append(m_stackName);
buffer.append(", stackVersion=").append(m_stackVersion);
buffer.append(", serviceName=").append(m_serviceName);
- buffer.append(", serviceDisplayName=").append(m_serviceDisplayName);
+ buffer.append(", serviceType=").append(m_serviceType);
buffer.append(", serviceGroupName=").append(m_serviceGroupName);
buffer.append(", componentName=").append(m_componentName);
buffer.append(", hostName=").append(m_hostName);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceComponentUninstalledEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceComponentUninstalledEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceComponentUninstalledEvent.java
index 803770d..2ad2940 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceComponentUninstalledEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceComponentUninstalledEvent.java
@@ -39,10 +39,10 @@ public class ServiceComponentUninstalledEvent extends ServiceEvent {
* @param hostName
*/
public ServiceComponentUninstalledEvent(long clusterId, String stackName, String stackVersion, String serviceName,
- String serviceDisplayName, String serviceGroupName, String componentName,
+ String serviceType, String serviceGroupName, String componentName,
String hostName, boolean recoveryEnabled) {
super(AmbariEventType.SERVICE_COMPONENT_UNINSTALLED_SUCCESS, clusterId,
- stackName, stackVersion, serviceName, serviceDisplayName, serviceGroupName);
+ stackName, stackVersion, serviceName, serviceType, serviceGroupName);
m_componentName = componentName;
m_hostName = hostName;
@@ -80,7 +80,7 @@ public class ServiceComponentUninstalledEvent extends ServiceEvent {
buffer.append(", stackName=").append(m_stackName);
buffer.append(", stackVersion=").append(m_stackVersion);
buffer.append(", serviceName=").append(m_serviceName);
- buffer.append(", serviceDisplayName=").append(m_serviceDisplayName);
+ buffer.append(", serviceType=").append(m_serviceType);
buffer.append(", serviceGroupName=").append(m_serviceGroupName);
buffer.append(", componentName=").append(m_componentName);
buffer.append(", hostName=").append(m_hostName);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceEvent.java
index 622c9d7..79f1566 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceEvent.java
@@ -29,9 +29,9 @@ public abstract class ServiceEvent extends ClusterEvent {
protected final String m_serviceName;
/**
- * The name of the real service.
+ * The type of the service (i.e. stack service name).
*/
- protected final String m_serviceDisplayName;
+ protected final String m_serviceType;
/**
* The name of the service group.
@@ -55,12 +55,12 @@ public abstract class ServiceEvent extends ClusterEvent {
* @param clusterId
*/
public ServiceEvent(AmbariEventType eventType, long clusterId, String stackName, String stackVersion,
- String serviceName, String serviceDisplayName, String serviceGroupName) {
+ String serviceName, String serviceType, String serviceGroupName) {
super(eventType, clusterId);
m_stackName = stackName;
m_stackVersion = stackVersion;
m_serviceName = serviceName;
- m_serviceDisplayName = serviceDisplayName;
+ m_serviceType = serviceType;
m_serviceGroupName = serviceGroupName;
}
@@ -72,9 +72,9 @@ public abstract class ServiceEvent extends ClusterEvent {
}
/**
- * @return the serviceDisplayName (never {@code null}).
+ * @return the serviceType (never {@code null}).
*/
- public String getServiceDisplayName() { return m_serviceDisplayName; }
+ public String getServiceType() { return m_serviceType; }
/**
* @return the service group name (never {@code null}).
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceInstalledEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceInstalledEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceInstalledEvent.java
index c7c7dd4..aa0a5ea 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceInstalledEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceInstalledEvent.java
@@ -29,13 +29,13 @@ public class ServiceInstalledEvent extends ServiceEvent {
* @param stackName
* @param stackVersion
* @param serviceName
- * @param serviceDisplayName
+ * @param serviceType
* @param serviceGroupName
*/
public ServiceInstalledEvent(long clusterId, String stackName, String stackVersion, String serviceName,
- String serviceDisplayName, String serviceGroupName) {
+ String serviceType, String serviceGroupName) {
super(AmbariEventType.SERVICE_INSTALL_SUCCESS, clusterId, stackName,
- stackVersion, serviceName, serviceDisplayName, serviceGroupName);
+ stackVersion, serviceName, serviceType, serviceGroupName);
}
/**
@@ -48,7 +48,7 @@ public class ServiceInstalledEvent extends ServiceEvent {
buffer.append(", stackName=").append(m_stackName);
buffer.append(", stackVersion=").append(m_stackVersion);
buffer.append(", serviceName=").append(m_serviceName);
- buffer.append(", serviceDisplayName=").append(m_serviceDisplayName);
+ buffer.append(", serviceType=").append(m_serviceType);
buffer.append(", serviceGroupName=").append(m_serviceGroupName);
buffer.append("}");
return buffer.toString();
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceRemovedEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceRemovedEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceRemovedEvent.java
index a8de84d..bc27247 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceRemovedEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceRemovedEvent.java
@@ -31,9 +31,9 @@ public class ServiceRemovedEvent extends ServiceEvent {
private final List<Component> components;
public ServiceRemovedEvent(long clusterId, String stackName, String stackVersion, String serviceName,
- String serviceDisplayName, String serviceGroupName, List<Component> components) {
+ String serviceType, String serviceGroupName, List<Component> components) {
super(AmbariEventType.SERVICE_REMOVED_SUCCESS, clusterId, stackName,
- stackVersion, serviceName, serviceDisplayName, serviceGroupName);
+ stackVersion, serviceName, serviceType, serviceGroupName);
this.components = components;
}
@@ -47,7 +47,7 @@ public class ServiceRemovedEvent extends ServiceEvent {
buffer.append(", stackName=").append(m_stackName);
buffer.append(", stackVersion=").append(m_stackVersion);
buffer.append(", serviceName=").append(m_serviceName);
- buffer.append(", serviceDisplayName=").append(m_serviceDisplayName);
+ buffer.append(", serviceType=").append(m_serviceType);
buffer.append(", serviceGroupName=").append(m_serviceGroupName);
buffer.append("}");
return buffer.toString();
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/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 fb6d017..01cdcdc 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
@@ -122,13 +122,14 @@ public class HostVersionOutOfSyncListener {
// If added components do not advertise version, it makes no sense to mark version OUT_OF_SYNC
// 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
- String serviceDisplayName = event.getServiceDisplayName();
+ String serviceName = event.getServiceName();
+ String serviceType = event.getServiceType();
String componentName = event.getComponentName();
ComponentInfo component = ami.get().getComponent(hostStackId.getStackName(),
- hostStackId.getStackVersion(), serviceDisplayName, componentName);
+ hostStackId.getStackVersion(), serviceType, componentName);
if (!component.isVersionAdvertised()) {
- RepositoryVersionState state = checkAllHostComponents(hostStackId, serviceDisplayName,
+ RepositoryVersionState state = checkAllHostComponents(hostStackId, serviceName, serviceType,
hostVersionEntity.getHostEntity());
if (null != state) {
hostVersionEntity.setState(state);
@@ -169,14 +170,15 @@ public class HostVersionOutOfSyncListener {
HostEntity hostEntity = hostVersionEntity.getHostEntity();
RepositoryVersionEntity repoVersionEntity = hostVersionEntity.getRepositoryVersion();
StackId stackId = repoVersionEntity.getStackId();
- String serviceDisplayName = event.getServiceDisplayName();
+ String serviceName = event.getServiceName();
+ String serviceType = event.getServiceType();
if (null == stackId) {
LOG.info("Stack id could not be loaded for host version {}, repo {}", hostVersionEntity.getHostName(),
repoVersionEntity.getVersion());
continue;
}
- RepositoryVersionState repoState = checkAllHostComponents(stackId, serviceDisplayName, hostEntity);
+ RepositoryVersionState repoState = checkAllHostComponents(stackId, serviceName, serviceType, hostEntity);
if (null != repoState) {
hostVersionEntity.setState(repoState);
hostVersionDAO.get().merge(hostVersionEntity);
@@ -199,14 +201,14 @@ public class HostVersionOutOfSyncListener {
* @param host the host entity to find components
* @return {@code null} if there should be no state change. non-{@code null} to change it
*/
- private RepositoryVersionState checkAllHostComponents(StackId stackId, String serviceDisplayName,
+ private RepositoryVersionState checkAllHostComponents(StackId stackId, String serviceName, String stackServiceName,
HostEntity host) throws AmbariException {
Collection<HostComponentDesiredStateEntity> hostComponents = host.getHostComponentDesiredStateEntities();
for (HostComponentDesiredStateEntity hostComponent : hostComponents) {
ComponentInfo ci = ami.get().getComponent(stackId.getStackName(), stackId.getStackVersion(),
- serviceDisplayName, hostComponent.getComponentName());
+ stackServiceName, hostComponent.getComponentName());
if (ci.isVersionAdvertised()) {
return null;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterServiceEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterServiceEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterServiceEntity.java
index f4ce5f9..9fca099 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterServiceEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterServiceEntity.java
@@ -71,8 +71,8 @@ public class ClusterServiceEntity {
@Column(name = "service_name", nullable = false, insertable = true, updatable = true)
private String serviceName;
- @Column(name = "service_display_name", nullable = false, insertable = true, updatable = true)
- private String serviceDisplayName;
+ @Column(name = "service_type", nullable = false, insertable = true, updatable = true)
+ private String serviceType;
@Basic
@Column(name = "service_enabled", nullable = false, insertable = true, updatable = true, length = 10)
@@ -126,12 +126,12 @@ public class ClusterServiceEntity {
this.serviceName = serviceName;
}
- public String getServiceDisplayName() {
- return serviceDisplayName;
+ public String getServiceType() {
+ return serviceType;
}
- public void setServiceDisplayName(String serviceDisplayName) {
- this.serviceDisplayName = serviceDisplayName;
+ public void setServiceType(String serviceType) {
+ this.serviceType = serviceType;
}
public int getServiceEnabled() {
@@ -154,7 +154,7 @@ public class ClusterServiceEntity {
if (serviceId != null ? !serviceId.equals(that.serviceId) : that.serviceId != null) return false;
if (serviceEnabled != null ? !serviceEnabled.equals(that.serviceEnabled) : that.serviceEnabled != null)
return false;
- if (serviceDisplayName != null ? !serviceDisplayName.equals(that.serviceDisplayName) : that.serviceDisplayName != null) return false;
+ if (serviceType != null ? !serviceType.equals(that.serviceType) : that.serviceType != null) return false;
return true;
}
@@ -164,7 +164,7 @@ public class ClusterServiceEntity {
int result = clusterId !=null ? clusterId.intValue() : 0;
result = 31 * result + (serviceGroupId != null ? serviceGroupId.hashCode() : 0);
result = 31 * result + (serviceId != null ? serviceId.hashCode() : 0);
- result = 31 * result + (serviceDisplayName != null ? serviceDisplayName.hashCode() : 0);
+ result = 31 * result + (serviceType != null ? serviceType.hashCode() : 0);
result = 31 * result + serviceEnabled;
return result;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/state/Cluster.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/Cluster.java b/ambari-server/src/main/java/org/apache/ambari/server/state/Cluster.java
index 0c1059b..8fd878e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/Cluster.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/Cluster.java
@@ -69,7 +69,7 @@ public interface Cluster {
*/
void addService(Service service);
- Service addService(ServiceGroup serviceGroup, String serviceName, String serviceDisplayName,
+ Service addService(ServiceGroup serviceGroup, String serviceName, String serviceType,
RepositoryVersionEntity repositoryVersion) throws AmbariException;
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/state/Service.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/Service.java b/ambari-server/src/main/java/org/apache/ambari/server/state/Service.java
index ce0afa9..b9ab79f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/Service.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/Service.java
@@ -36,7 +36,9 @@ public interface Service {
String getName();
- String getServiceDisplayName();
+ String getDisplayName();
+
+ String getServiceType();
Cluster getCluster();
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponent.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponent.java
index dd25992..3c44fdf 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponent.java
@@ -44,7 +44,7 @@ public interface ServiceComponent {
String getServiceName();
- String getServiceDisplayName();
+ String getServiceType();
Long getServiceGroupId();
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHost.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHost.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHost.java
index 1b35072..54c378d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHost.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHost.java
@@ -65,10 +65,10 @@ public interface ServiceComponentHost {
String getServiceGroupName();
/**
- * Get the Real Service this object maps to
- * @return Name of the Real Service
+ * Get the Service Type this object maps to
+ * @return Type of the Service
*/
- String getServiceDisplayName();
+ String getServiceType();
/**
* Get the ServiceComponent this object maps to
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/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 7e66734..df6437e 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
@@ -260,7 +260,7 @@ public class ServiceComponentImpl implements ServiceComponent {
}
@Override
- public String getServiceDisplayName() { return service.getServiceDisplayName(); }
+ public String getServiceType() { return service.getServiceType(); }
@Override
public Long getClusterId() { return service.getClusterId(); }
@@ -439,7 +439,7 @@ public class ServiceComponentImpl implements ServiceComponent {
}
ServiceComponentResponse r = new ServiceComponentResponse(getClusterId(),
cluster.getClusterName(), sg.getServiceGroupId(), sg.getServiceGroupName(), service.getServiceId(),
- service.getName(), service.getServiceDisplayName(), getName(), desiredStackId, getDesiredState().toString(),
+ service.getName(), service.getServiceType(), getName(), desiredStackId, getDesiredState().toString(),
getServiceComponentStateCount(), isRecoveryEnabled(), displayName, repositoryVersionEntity.getVersion(),
getRepositoryState());
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceFactory.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceFactory.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceFactory.java
index 883fa2d..b48d825 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceFactory.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceFactory.java
@@ -34,15 +34,15 @@ public interface ServiceFactory {
* the ServiceGroup for the service
* @param serviceName
* the name of the service (not {@code null).
- * @param serviceDisplayName
- * the display name of the service (not {@code null).
+ * @param serviceType
+ * the type of service (stack service name) (not {@code null).
* @param desiredRepositoryVersion
* the repository version of the service (not {@code null).
* @return
*/
Service createNew(Cluster cluster, ServiceGroup serviceGroup,
@Assisted("serviceName") String serviceName,
- @Assisted("serviceDisplayName") String serviceDisplayName,
+ @Assisted("serviceType") String serviceType,
RepositoryVersionEntity desiredRepositoryVersion);
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/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 afb315c..70344b0 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
@@ -107,11 +107,11 @@ public class ServiceImpl implements Service {
/**
* The stack service name.
*/
- private final String serviceDisplayName;
+ private final String serviceType;
@AssistedInject
ServiceImpl(@Assisted Cluster cluster, @Assisted ServiceGroup serviceGroup,
- @Assisted("serviceName") String serviceName, @Assisted("serviceDisplayName") String serviceDisplayName,
+ @Assisted("serviceName") String serviceName, @Assisted("serviceType") String serviceType,
@Assisted RepositoryVersionEntity desiredRepositoryVersion,
ClusterDAO clusterDAO, ServiceGroupDAO serviceGroupDAO,
ClusterServiceDAO clusterServiceDAO, ServiceDesiredStateDAO serviceDesiredStateDAO,
@@ -126,14 +126,14 @@ public class ServiceImpl implements Service {
this.serviceComponentFactory = serviceComponentFactory;
this.eventPublisher = eventPublisher;
this.serviceName = serviceName;
- this.serviceDisplayName = serviceDisplayName;
+ this.serviceType = serviceType;
this.ambariMetaInfo = ambariMetaInfo;
ClusterServiceEntity serviceEntity = new ClusterServiceEntity();
serviceEntity.setClusterId(cluster.getClusterId());
serviceEntity.setServiceGroupId(serviceGroup.getServiceGroupId());
serviceEntity.setServiceName(serviceName);
- serviceEntity.setServiceDisplayName(serviceDisplayName);
+ serviceEntity.setServiceType(serviceType);
ServiceDesiredStateEntity serviceDesiredStateEntity = new ServiceDesiredStateEntity();
serviceDesiredStateEntity.setClusterId(cluster.getClusterId());
@@ -148,7 +148,7 @@ public class ServiceImpl implements Service {
StackId stackId = desiredRepositoryVersion.getStackId();
ServiceInfo sInfo = ambariMetaInfo.getService(stackId.getStackName(),
- stackId.getStackVersion(), serviceDisplayName);
+ stackId.getStackVersion(), serviceType);
displayName = sInfo.getDisplayName();
isClientOnlyService = sInfo.isClientOnlyService();
@@ -175,7 +175,7 @@ public class ServiceImpl implements Service {
this.eventPublisher = eventPublisher;
this.serviceId = serviceEntity.getServiceId();
this.serviceName = serviceEntity.getServiceName();
- this.serviceDisplayName = serviceEntity.getServiceDisplayName();
+ this.serviceType = serviceEntity.getServiceType();
this.ambariMetaInfo = ambariMetaInfo;
ServiceDesiredStateEntity serviceDesiredStateEntity = serviceEntity.getServiceDesiredStateEntity();
@@ -193,7 +193,7 @@ public class ServiceImpl implements Service {
StackId stackId = new StackId(serviceComponentDesiredStateEntity.getDesiredStack());
LOG.error(String.format("Can not get component info: stackName=%s, stackVersion=%s, serviceName=%s, componentName=%s",
stackId.getStackName(), stackId.getStackVersion(),
- serviceEntity.getServiceDisplayName(), serviceComponentDesiredStateEntity.getComponentName()));
+ serviceEntity.getServiceName(), serviceComponentDesiredStateEntity.getComponentName()));
ex.printStackTrace();
}
}
@@ -235,8 +235,11 @@ public class ServiceImpl implements Service {
public String getName() { return serviceName; }
@Override
- public String getServiceDisplayName() {
- return serviceDisplayName;
+ public String getDisplayName() { return displayName; }
+
+ @Override
+ public String getServiceType() {
+ return serviceType;
}
@Override
@@ -276,7 +279,7 @@ public class ServiceImpl implements Service {
throw new AmbariException("Cannot add duplicate ServiceComponent"
+ ", clusterName=" + cluster.getClusterName()
+ ", clusterId=" + cluster.getClusterId()
- + ", serviceName=" + getServiceDisplayName()
+ + ", serviceName=" + getName()
+ ", serviceComponentName=" + component.getName());
}
@@ -297,7 +300,7 @@ public class ServiceImpl implements Service {
ServiceComponent serviceComponent = components.get(componentName);
if (null == serviceComponent) {
throw new ServiceComponentNotFoundException(cluster.getClusterName(),
- getName(), getServiceDisplayName(), serviceGroup.getServiceGroupName(), componentName);
+ getName(), getServiceType(), serviceGroup.getServiceGroupName(), componentName);
}
return serviceComponent;
@@ -313,7 +316,7 @@ public class ServiceImpl implements Service {
public void setDesiredState(State state) {
if (LOG.isDebugEnabled()) {
LOG.debug("Setting DesiredState of Service, clusterName={}, clusterId={}, serviceName={}, oldDesiredState={}, newDesiredState={}",
- cluster.getClusterName(), cluster.getClusterId(), getServiceDisplayName(), getDesiredState(), state);
+ cluster.getClusterName(), cluster.getClusterId(), getName(), getDesiredState(), state);
}
ServiceDesiredStateEntity serviceDesiredStateEntity = getServiceDesiredStateEntity();
@@ -385,7 +388,7 @@ public class ServiceImpl implements Service {
ServiceResponse r = new ServiceResponse(cluster.getClusterId(), cluster.getClusterName(),
serviceGroup.getServiceGroupId(), serviceGroup.getServiceGroupName(),
- getServiceId(), getName(), getServiceDisplayName(), desiredStackId, desiredRespositoryVersion.getVersion(),
+ getServiceId(), getName(), getServiceType(), desiredStackId, desiredRespositoryVersion.getVersion(),
getRepositoryState(), getDesiredState().toString(), isCredentialStoreSupported(), isCredentialStoreEnabled());
r.setDesiredRepositoryVersionId(desiredRespositoryVersion.getId());
@@ -452,7 +455,7 @@ public class ServiceImpl implements Service {
public void setCredentialStoreEnabled(boolean credentialStoreEnabled) {
if (LOG.isDebugEnabled()) {
LOG.debug("Setting CredentialStoreEnabled of Service, clusterName={}, clusterId={}, serviceName={}, oldCredentialStoreEnabled={}, newCredentialStoreEnabled={}",
- cluster.getClusterName(), cluster.getClusterId(), getServiceDisplayName(), isCredentialStoreEnabled(), credentialStoreEnabled);
+ cluster.getClusterName(), cluster.getClusterId(), getName(), isCredentialStoreEnabled(), credentialStoreEnabled);
}
ServiceDesiredStateEntity desiredStateEntity = getServiceDesiredStateEntity();
@@ -469,7 +472,7 @@ public class ServiceImpl implements Service {
@Override
public void debugDump(StringBuilder sb) {
sb.append("Service={ serviceName=").append(getName())
- .append(", serviceDisplayName=").append(getServiceDisplayName())
+ .append(", serviceType=").append(getServiceType())
.append(", clusterName=").append(cluster.getClusterName())
.append(", clusterId=").append(cluster.getClusterId())
.append(", desiredStackVersion=").append(getDesiredStackId())
@@ -499,7 +502,7 @@ public class ServiceImpl implements Service {
cluster.addService(this);
ServiceInstalledEvent event = new ServiceInstalledEvent(getClusterId(), stackId.getStackName(),
- stackId.getStackVersion(), getName(), serviceDisplayName, serviceGroup.getServiceGroupName());
+ stackId.getStackVersion(), getName(), serviceType, serviceGroup.getServiceGroupName());
eventPublisher.publish(event);
}
@@ -533,8 +536,8 @@ public class ServiceImpl implements Service {
for (ServiceComponent sc : components.values()) {
if (!sc.canBeRemoved()) {
LOG.warn("Found non-removable component when trying to delete service" + ", clusterName="
- + cluster.getClusterName() + ", serviceName=" + getName() + ", serviceDisplayName="
- + getServiceDisplayName() + ", componentName=" + sc.getName());
+ + cluster.getClusterName() + ", serviceName=" + getName() + ", serviceType="
+ + getServiceType() + ", componentName=" + sc.getName());
return false;
}
}
@@ -555,7 +558,7 @@ public class ServiceImpl implements Service {
}
}
- LOG.info("Deleting all configuration associations for {} on cluster {}", getServiceDisplayName(), cluster.getClusterName());
+ LOG.info("Deleting all configuration associations for {} on cluster {}", getName(), cluster.getClusterName());
List<ServiceConfigEntity> serviceConfigEntities =
serviceConfigDAO.findByService(cluster.getClusterId(), getName());
@@ -573,13 +576,13 @@ public class ServiceImpl implements Service {
lock.lock();
try {
LOG.info("Deleting all components for service" + ", clusterName=" + cluster.getClusterName()
- + ", serviceDisplayName=" + getServiceDisplayName());
+ + ", serviceName=" + getName());
// FIXME check dependencies from meta layer
for (ServiceComponent component : components.values()) {
if (!component.canBeRemoved()) {
throw new AmbariException("Found non removable component when trying to"
+ " delete all components from service" + ", clusterName=" + cluster.getClusterName()
- + ", getServiceDisplayName=" + getServiceDisplayName() + ", componentName=" + component.getName());
+ + ", serviceName=" + getName() + ", componentName=" + component.getName());
}
}
@@ -600,12 +603,12 @@ public class ServiceImpl implements Service {
try {
ServiceComponent component = getServiceComponent(componentName);
LOG.info("Deleting servicecomponent for cluster" + ", clusterName=" + cluster.getClusterName()
- + ", getServiceDisplayName=" + getServiceDisplayName() + ", componentName=" + componentName);
+ + ", serviceName=" + getName() + ", componentName=" + componentName);
// FIXME check dependencies from meta layer
if (!component.canBeRemoved()) {
throw new AmbariException("Could not delete component from cluster"
+ ", clusterName=" + cluster.getClusterName()
- + ", getServiceDisplayName=" + getServiceDisplayName()
+ + ", serviceName=" + getName()
+ ", componentName=" + componentName);
}
@@ -638,7 +641,7 @@ public class ServiceImpl implements Service {
}
ServiceRemovedEvent event = new ServiceRemovedEvent(getClusterId(), stackId.getStackName(), stackId.getStackVersion(),
- getName(), getServiceDisplayName(),
+ getName(), getServiceType(),
serviceGroup.getServiceGroupName(), components);
eventPublisher.publish(event);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/state/StackInfo.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/StackInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/StackInfo.java
index ab0e368..93d81f4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/StackInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/StackInfo.java
@@ -172,10 +172,10 @@ public class StackInfo implements Comparable<StackInfo>, Validable {
return services;
}
- public ServiceInfo getService(String serviceName) {
+ public ServiceInfo getService(String stackServiceName) {
Collection<ServiceInfo> services = getServices();
for (ServiceInfo service : services) {
- if (service.getName().equals(serviceName)) {
+ if (service.getName().equals(stackServiceName)) {
return service;
}
}
@@ -638,7 +638,8 @@ public class StackInfo implements Comparable<StackInfo>, Validable {
}
/**
- * @param xml the version definition parsed from {@link LatestRepoCallable}
+ *
+ * @return
*/
public VersionDefinitionXml getLatestVersionDefinition() {
return latestVersion;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/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 6b32d4c..e39f74e 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
@@ -856,8 +856,8 @@ public class ClusterImpl implements Cluster {
@Override
public void addService(Service service) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Adding a new Service, clusterName={}, clusterId={}, serviceName={} serviceDisplayName={}",
- getClusterName(), getClusterId(), service.getName(), service.getServiceDisplayName());
+ LOG.debug("Adding a new Service, clusterName={}, clusterId={}, serviceName={} serviceType={}",
+ getClusterName(), getClusterId(), service.getName(), service.getServiceType());
}
services.put(service.getName(), service);
}
@@ -866,17 +866,17 @@ public class ClusterImpl implements Cluster {
* {@inheritDoc}
*/
@Override
- public Service addService(ServiceGroup serviceGroup, String serviceName, String serviceDisplayName,
+ public Service addService(ServiceGroup serviceGroup, String serviceName, String serviceType,
RepositoryVersionEntity repositoryVersion) throws AmbariException {
if (services.containsKey(serviceName)) {
- String message = MessageFormat.format("The {0} service already exists in {1}", serviceDisplayName,
+ String message = MessageFormat.format("The {0} service already exists in {1}", serviceName,
getClusterName());
throw new AmbariException(message);
}
@Experimental(feature = ExperimentalFeature.PATCH_UPGRADES)
- Service service = serviceFactory.createNew(this, serviceGroup, serviceName, serviceDisplayName, repositoryVersion);
+ Service service = serviceFactory.createNew(this, serviceGroup, serviceName, serviceType, repositoryVersion);
addService(service);
return service;