You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2017/10/11 23:03:41 UTC
[14/50] [abbrv] ambari git commit: AMBARI-22164: Update services API
to user service_name, service_type instead of service_display_name,
service_name (jluniya)
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': {