From 65c79f8171d0e29f15752b55087f7268b25905e1 Mon Sep 17 00:00:00 2001 From: Madhuvanthi Radhakrishnan Date: Wed, 7 Mar 2018 17:06:15 -0800 Subject: [PATCH 1/3] [AMBARI-23177] Yarn-MR separation and minor deployment fixes --- .../libraries/functions/get_not_managed_resources.py | 5 +++-- .../ambari/server/orm/entities/RepoDefinitionEntity.java | 2 +- ambari-web/app/models/stack_service.js | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/get_not_managed_resources.py b/ambari-common/src/main/python/resource_management/libraries/functions/get_not_managed_resources.py index 4af636bc7d5..b6ed861cfc0 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/get_not_managed_resources.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/get_not_managed_resources.py @@ -25,6 +25,7 @@ from resource_management.libraries.script import Script from resource_management.core.logger import Logger from resource_management.libraries.functions.default import default +from resource_management.libraries.functions.cluster_settings import * def get_not_managed_resources(): """ @@ -34,8 +35,8 @@ def get_not_managed_resources(): """ config = Script.get_config() not_managed_hdfs_path_list = json.loads(config['hostLevelParams']['not_managed_hdfs_path_list'])[:] - if 'managed_hdfs_resource_property_names' in config['configurations']['cluster-env']: - managed_hdfs_resource_property_names = config['configurations']['cluster-env']['managed_hdfs_resource_property_names'] + if get_cluster_setting('managed_hdfs_resource_property_names') not None: + managed_hdfs_resource_property_names = get_cluster_setting_value('managed_hdfs_resource_property_names') managed_hdfs_resource_property_list = filter(None, [property.strip() for property in managed_hdfs_resource_property_names.split(',')]) for property_name in managed_hdfs_resource_property_list: diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoDefinitionEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoDefinitionEntity.java index 3b5060825c0..fbf9af1900c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoDefinitionEntity.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoDefinitionEntity.java @@ -37,7 +37,7 @@ import org.apache.ambari.server.state.RepositoryInfo; import org.apache.ambari.server.state.stack.RepoTag; -import org.apache.commons.lang.builder.ToStringBuilder; + import com.google.common.base.Objects; diff --git a/ambari-web/app/models/stack_service.js b/ambari-web/app/models/stack_service.js index 3240ef42c2f..493807a376d 100644 --- a/ambari-web/app/models/stack_service.js +++ b/ambari-web/app/models/stack_service.js @@ -206,7 +206,7 @@ App.StackService = DS.Model.extend({ }.property('coSelectedServices', 'serviceName'), isHiddenOnSelectServicePage: function () { - var hiddenServices = ['MAPREDUCE2']; + var hiddenServices = []; return hiddenServices.contains(this.get('serviceName')) || !this.get('isInstallable') || this.get('doNotShowAndInstall'); }.property('serviceName', 'isInstallable'), From e0d85d38b8136d836a3ccc2d3553eb40ab053fcd Mon Sep 17 00:00:00 2001 From: Madhuvanthi Radhakrishnan Date: Thu, 8 Mar 2018 11:33:28 -0800 Subject: [PATCH 2/3] Review comments --- .../libraries/functions/get_not_managed_resources.py | 2 +- ambari-web/app/models/stack_service.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/get_not_managed_resources.py b/ambari-common/src/main/python/resource_management/libraries/functions/get_not_managed_resources.py index b6ed861cfc0..150ecec2381 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/get_not_managed_resources.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/get_not_managed_resources.py @@ -25,7 +25,7 @@ from resource_management.libraries.script import Script from resource_management.core.logger import Logger from resource_management.libraries.functions.default import default -from resource_management.libraries.functions.cluster_settings import * +from resource_management.libraries.functions.cluster_settings import get_cluster_setting_value, get_cluster_setting def get_not_managed_resources(): """ diff --git a/ambari-web/app/models/stack_service.js b/ambari-web/app/models/stack_service.js index 493807a376d..12d411945d3 100644 --- a/ambari-web/app/models/stack_service.js +++ b/ambari-web/app/models/stack_service.js @@ -206,7 +206,8 @@ App.StackService = DS.Model.extend({ }.property('coSelectedServices', 'serviceName'), isHiddenOnSelectServicePage: function () { - var hiddenServices = []; + //var hiddenServices = ['MAPREDUCE2']; + var hiddenServices = []; return hiddenServices.contains(this.get('serviceName')) || !this.get('isInstallable') || this.get('doNotShowAndInstall'); }.property('serviceName', 'isInstallable'), @@ -340,7 +341,7 @@ App.StackService.componentsOrderForService = { //@TODO: Write unit test for no two keys in the object should have any intersecting elements in their values App.StackService.coSelected = { - +// 'YARN': ['MAPREDUCE2'] }; From 6e1c9cf4cb3ad1b848ac96ebb8a1693f47cc216a Mon Sep 17 00:00:00 2001 From: Madhuvanthi Radhakrishnan Date: Thu, 8 Mar 2018 12:40:37 -0800 Subject: [PATCH 3/3] Review comments --- .../libraries/functions/get_not_managed_resources.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/get_not_managed_resources.py b/ambari-common/src/main/python/resource_management/libraries/functions/get_not_managed_resources.py index 150ecec2381..10765bb32f4 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/get_not_managed_resources.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/get_not_managed_resources.py @@ -35,7 +35,7 @@ def get_not_managed_resources(): """ config = Script.get_config() not_managed_hdfs_path_list = json.loads(config['hostLevelParams']['not_managed_hdfs_path_list'])[:] - if get_cluster_setting('managed_hdfs_resource_property_names') not None: + if get_cluster_setting('managed_hdfs_resource_property_names') is not None: managed_hdfs_resource_property_names = get_cluster_setting_value('managed_hdfs_resource_property_names') managed_hdfs_resource_property_list = filter(None, [property.strip() for property in managed_hdfs_resource_property_names.split(',')])