You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2017/01/25 18:57:13 UTC
[24/50] [abbrv] ambari git commit: AMBARI-19686. Add condition for
detecting Blueprint call so that 'llap' named queue can be created on 1st BP
invocation, if deemed required.
AMBARI-19686. Add condition for detecting Blueprint call so that 'llap' named queue can be created on 1st BP invocation, if deemed required.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/796f52a4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/796f52a4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/796f52a4
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 796f52a47acb8a04c4e8a7e225863cd848460ed7
Parents: 9c952c3
Author: Swapan Shridhar <ss...@hortonworks.com>
Authored: Mon Jan 23 17:46:59 2017 -0800
Committer: Swapan Shridhar <ss...@hortonworks.com>
Committed: Mon Jan 23 17:46:59 2017 -0800
----------------------------------------------------------------------
.../src/main/resources/stacks/HDP/2.5/services/stack_advisor.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/796f52a4/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
index 04ada3e..d2c0459 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
@@ -778,7 +778,9 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
# Check if it's 1st invocation after enabling Hive Server Interactive (config: enable_hive_interactive).
changed_configs_has_enable_hive_int = self.isConfigPropertiesChanged(services, "hive-interactive-env", ['enable_hive_interactive'], False)
llap_named_queue_selected_in_curr_invocation = None
- if changed_configs_has_enable_hive_int \
+ # Check if its : 1. 1st invocation from UI ('enable_hive_interactive' in changed-configurations)
+ # OR 2. 1st invocation from BP (services['changed-configurations'] should be empty in this case)
+ if (changed_configs_has_enable_hive_int or 0 == len(services['changed-configurations']))\
and services['configurations']['hive-interactive-env']['properties']['enable_hive_interactive']:
if len(leafQueueNames) == 1 or (len(leafQueueNames) == 2 and llap_queue_name in leafQueueNames):
llap_named_queue_selected_in_curr_invocation = True