Repository: ambari Updated Branches: refs/heads/branch-2.5 c632b1d8d -> 576893a8a
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/576893a8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/576893a8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/576893a8 Branch: refs/heads/branch-2.5 Commit: 576893a8aeb8f41acdc7db48ada72b1d507a61dd Parents: c632b1d Author: Swapan Shridhar <sshrid...@hortonworks.com> Authored: Mon Jan 23 17:46:59 2017 -0800 Committer: Swapan Shridhar <sshrid...@hortonworks.com> Committed: Mon Jan 23 17:56:38 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/576893a8/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
