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 2016/02/19 20:16:40 UTC
ambari git commit: AMBARI-15117. After Ambari-upgrade,
Hive configurations are not showing up in Ambari UI. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk f000a5c44 -> bd5fcae47
AMBARI-15117. After Ambari-upgrade, Hive configurations are not showing up in Ambari UI. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bd5fcae4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bd5fcae4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bd5fcae4
Branch: refs/heads/trunk
Commit: bd5fcae473fe6ad0815b3958024542a5204feefa
Parents: f000a5c
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Sat Feb 20 00:45:34 2016 +0530
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Sat Feb 20 00:46:31 2016 +0530
----------------------------------------------------------------------
.../stacks/HDP/2.2/services/stack_advisor.py | 17 ++++++++++-------
.../python/stacks/2.2/common/test_stack_advisor.py | 13 +++++++++++--
.../configs/widgets/list_config_widget_view.js | 11 +++++------
3 files changed, 26 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/bd5fcae4/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
index dc968cc..cd25d77 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
@@ -367,13 +367,16 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
yarn_queues = "default"
capacitySchedulerProperties = {}
- if "capacity-scheduler" in services['configurations'] and "capacity-scheduler" in services['configurations']["capacity-scheduler"]["properties"]:
- properties = str(services['configurations']["capacity-scheduler"]["properties"]["capacity-scheduler"]).split('\n')
- for property in properties:
- key,sep,value = property.partition("=")
- capacitySchedulerProperties[key] = value
- if "yarn.scheduler.capacity.root.queues" in capacitySchedulerProperties:
- yarn_queues = str(capacitySchedulerProperties["yarn.scheduler.capacity.root.queues"])
+ if "capacity-scheduler" in services['configurations']:
+ if "capacity-scheduler" in services['configurations']["capacity-scheduler"]["properties"]:
+ properties = str(services['configurations']["capacity-scheduler"]["properties"]["capacity-scheduler"]).split('\n')
+ for property in properties:
+ key,sep,value = property.partition("=")
+ capacitySchedulerProperties[key] = value
+ if "yarn.scheduler.capacity.root.queues" in capacitySchedulerProperties:
+ yarn_queues = str(capacitySchedulerProperties["yarn.scheduler.capacity.root.queues"])
+ elif "yarn.scheduler.capacity.root.queues" in services['configurations']["capacity-scheduler"]["properties"]:
+ yarn_queues = services['configurations']["capacity-scheduler"]["properties"]["yarn.scheduler.capacity.root.queues"]
# Interactive Queues property attributes
putHiveServerPropertyAttribute = self.putPropertyAttribute(configurations, "hiveserver2-site")
toProcessQueues = yarn_queues.split(",")
http://git-wip-us.apache.org/repos/asf/ambari/blob/bd5fcae4/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
index d48b78d..d230030 100644
--- a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
@@ -1028,7 +1028,7 @@ class TestHDP22StackAdvisor(TestCase):
'hive-site': {
'properties': {
'hive.server2.enable.doAs': 'true',
- 'hive.server2.tez.default.queues': "default",
+ 'hive.server2.tez.default.queues': "queue1,queue2",
'hive.server2.tez.initialize.default.sessions': 'false',
'hive.server2.tez.sessions.per.default.queue': '1',
'hive.auto.convert.join.noconditionaltask.size': '268435456',
@@ -1073,7 +1073,16 @@ class TestHDP22StackAdvisor(TestCase):
'hive.server2.authentication.kerberos.keytab': {'delete': 'true'},
'hive.server2.authentication.ldap.url': {'delete': 'true'},
'hive.server2.tez.default.queues': {
- 'entries': [{'value': 'default', 'label': 'default queue'}]
+ "entries": [
+ {
+ "value": "queue1",
+ "label": "queue1 queue"
+ },
+ {
+ "value": "queue2",
+ "label": "queue2 queue"
+ }
+ ]
}
}
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/bd5fcae4/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js b/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js
index fcf2aac..568c405 100644
--- a/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js
@@ -288,16 +288,15 @@ App.ListConfigWidgetView = App.ConfigWidgetView.extend({
},
isOptionExist: function(value) {
- var isExist = false;
- if (value !== null && value !== undefined) {
+ var isExist = true;
+ if (Em.isNone(value)) {
+ return !isExist;
+ } else {
value = Em.typeOf(value) == 'string' ? value.split(',') : value;
value.forEach(function(item) {
- isExist = this.get('options').mapProperty('value').contains(item);
+ isExist = isExist && this.get('options').mapProperty('value').contains(item);
}, this);
return isExist;
- } else {
- return false;
}
}
-
});