Repository: ambari Updated Branches: refs/heads/trunk f6ecbd1d7 -> 2ece0b331
AMBARI-21909. LLAP concurrency (hive.server2.tez.sessions.per.default.queue) max calculated value should not be less than its current value. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2ece0b33 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2ece0b33 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2ece0b33 Branch: refs/heads/trunk Commit: 2ece0b3317766fa7f89b80c64cd3ae5adfa8cbde Parents: f6ecbd1 Author: Swapan Shridhar <sshrid...@hortonworks.com> Authored: Thu Sep 7 15:47:09 2017 -0700 Committer: Swapan Shridhar <sshrid...@hortonworks.com> Committed: Thu Sep 7 22:44:57 2017 -0700 ---------------------------------------------------------------------- .../resources/common-services/YARN/3.0.0.3.0/service_advisor.py | 5 +++++ .../src/main/resources/stacks/HDP/2.5/services/stack_advisor.py | 5 +++++ 2 files changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2ece0b33/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py index 74e0510..ecf245d 100644 --- a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py +++ b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py @@ -1011,6 +1011,11 @@ class YARNRecommender(service_advisor.ServiceAdvisor): putHiveInteractiveSiteProperty('hive.server2.tez.sessions.per.default.queue', long(llap_concurrency)) putHiveInteractiveSitePropertyAttribute('hive.server2.tez.sessions.per.default.queue', "minimum", min_llap_concurrency) + # Check if 'max_llap_concurreny' < 'llap_concurrency'. + if max_llap_concurreny < llap_concurrency: + self.logger.info("DBG: Adjusting 'max_llap_concurreny' to : {0}, based on 'llap_concurrency' : {1} and " + "earlier 'max_llap_concurreny' : {2}. ".format(llap_concurrency, llap_concurrency, max_llap_concurreny)) + max_llap_concurreny = llap_concurrency putHiveInteractiveSitePropertyAttribute('hive.server2.tez.sessions.per.default.queue', "maximum", long(max_llap_concurreny)) num_llap_nodes = long(num_llap_nodes) http://git-wip-us.apache.org/repos/asf/ambari/blob/2ece0b33/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 2dc493a..2a5d76b 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 @@ -1293,6 +1293,11 @@ class HDP25StackAdvisor(HDP24StackAdvisor): putHiveInteractiveSiteProperty('hive.server2.tez.sessions.per.default.queue', long(llap_concurrency)) putHiveInteractiveSitePropertyAttribute('hive.server2.tez.sessions.per.default.queue', "minimum", min_llap_concurrency) + # Check if 'max_llap_concurreny' < 'llap_concurrency'. + if max_llap_concurreny < llap_concurrency: + self.logger.info("DBG: Adjusting 'max_llap_concurreny' to : {0}, based on 'llap_concurrency' : {1} and " + "earlier 'max_llap_concurreny' : {2}. ".format(llap_concurrency, llap_concurrency, max_llap_concurreny)) + max_llap_concurreny = llap_concurrency putHiveInteractiveSitePropertyAttribute('hive.server2.tez.sessions.per.default.queue', "maximum", long(max_llap_concurreny)) num_llap_nodes = long(num_llap_nodes)
