You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2017/02/15 21:46:07 UTC
[1/2] ambari git commit: AMBARI-20033. Typecasting to 'long' from
earlier 'float',
before setting them the following configs for recommendation : (1).
'llap_concurrency',
(2). 'llap_concurrency' max value and (3). 'hive.llap.daemon.num.executors'
max val
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 d2de31ee1 -> d7b068a17
AMBARI-20033. Typecasting to 'long' from earlier 'float', before setting them the following configs for recommendation : (1). 'llap_concurrency', (2). 'llap_concurrency' max value and (3). 'hive.llap.daemon.num.executors' max value.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e8580c27
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e8580c27
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e8580c27
Branch: refs/heads/branch-2.5
Commit: e8580c271483a47e944300b452fa58c62a73990b
Parents: d2de31e
Author: Swapan Shridhar <ss...@hortonworks.com>
Authored: Wed Feb 15 13:39:29 2017 -0800
Committer: Swapan Shridhar <ss...@hortonworks.com>
Committed: Wed Feb 15 13:39:29 2017 -0800
----------------------------------------------------------------------
.../resources/stacks/HDP/2.5/services/stack_advisor.py | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e8580c27/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 078f04f..8d7aaf7 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
@@ -1031,12 +1031,15 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
mem_per_thread_for_llap, normalized_tez_am_container_size))
if llap_concurrency == 0:
llap_concurrency = 1
+ Logger.info("DBG: Readjusted 'llap_concurrency' to : 1. Earlier calculated value : 0")
if llap_concurrency * normalized_tez_am_container_size > hive_tez_am_cap_available:
- llap_concurrency = math.floor(hive_tez_am_cap_available / normalized_tez_am_container_size)
+ llap_concurrency = long(math.floor(hive_tez_am_cap_available / normalized_tez_am_container_size))
+ Logger.info("DBG: Readjusted 'llap_concurrency' to : {0}, as llap_concurrency({1}) * normalized_tez_am_container_size({2}) > hive_tez_am_cap_available({3}))"
+ .format(llap_concurrency, llap_concurrency, normalized_tez_am_container_size, hive_tez_am_cap_available))
if llap_concurrency <= 0:
- Logger.warning("Calculated 'LLAP Concurrent Queries' = {0}. Expected value >= 1.".format(llap_concurrency))
+ Logger.warning("DBG: Calculated 'LLAP Concurrent Queries' = {0}. Expected value >= 1.".format(llap_concurrency))
self.recommendDefaultLlapConfiguration(configurations, services, hosts)
return
Logger.info("DBG: Adjusted 'llap_concurrency' : {0}, using following: hive_tez_am_cap_available : {1}, normalized_tez_am_container_size: "
@@ -1062,8 +1065,8 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
": {2}, MIN_EXECUTOR_TO_AM_RATIO : {3}, MAX_CONCURRENT_QUERIES : {4}".format(max_llap_concurreny_limit, max_executors_per_node,
num_llap_nodes_requested, MIN_EXECUTOR_TO_AM_RATIO,
MAX_CONCURRENT_QUERIES))
- max_llap_concurreny = min(max_llap_concurreny_limit, math.floor(llap_mem_for_tezAm_and_daemons / (MIN_EXECUTOR_TO_AM_RATIO *
- mem_per_thread_for_llap + normalized_tez_am_container_size)))
+ max_llap_concurreny = long(min(max_llap_concurreny_limit, math.floor(llap_mem_for_tezAm_and_daemons / (MIN_EXECUTOR_TO_AM_RATIO *
+ mem_per_thread_for_llap + normalized_tez_am_container_size))))
Logger.info("DBG: Calculated 'max_llap_concurreny' : {0}, using following : max_llap_concurreny_limit : {1}, llap_mem_for_tezAm_and_daemons : "
"{2}, MIN_EXECUTOR_TO_AM_RATIO : {3}, mem_per_thread_for_llap : {4}, normalized_tez_am_container_size : "
"{5}".format(max_llap_concurreny, max_llap_concurreny_limit, llap_mem_for_tezAm_and_daemons, MIN_EXECUTOR_TO_AM_RATIO,
@@ -1209,7 +1212,7 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
Logger.info("DBG: Putting num_executors_per_node as {0}".format(num_executors_per_node))
putHiveInteractiveSiteProperty('hive.llap.daemon.num.executors', num_executors_per_node)
putHiveInteractiveSitePropertyAttribute('hive.llap.daemon.num.executors', "minimum", 1)
- putHiveInteractiveSitePropertyAttribute('hive.llap.daemon.num.executors', "maximum", float(num_executors_per_node_max))
+ putHiveInteractiveSitePropertyAttribute('hive.llap.daemon.num.executors', "maximum", long(num_executors_per_node_max))
# 'hive.llap.io.threadpool.size' config value is to be set same as value calculated for
# 'hive.llap.daemon.num.executors' at all times.
[2/2] ambari git commit: AMBARI-19965. Move kerberos properties for
superset to correct level in kerberos.json. (Nishant Bangarwa via Swapan
Shridhar)
Posted by sw...@apache.org.
AMBARI-19965. Move kerberos properties for superset to correct level in kerberos.json. (Nishant Bangarwa via Swapan Shridhar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d7b068a1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d7b068a1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d7b068a1
Branch: refs/heads/branch-2.5
Commit: d7b068a175ae934b5dd8a76161bd294877644986
Parents: e8580c2
Author: Swapan Shridhar <ss...@hortonworks.com>
Authored: Wed Feb 15 13:44:28 2017 -0800
Committer: Swapan Shridhar <ss...@hortonworks.com>
Committed: Wed Feb 15 13:45:57 2017 -0800
----------------------------------------------------------------------
.../stacks/HDP/2.6/services/DRUID/kerberos.json | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d7b068a1/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json
index 0ba5071..6aefc63 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json
@@ -112,15 +112,17 @@
{
"druid-common": {
"druid.hadoop.security.spnego.excludedPaths": "[\"/status\"]",
- "druid.security.extensions.loadList" : "[\"druid-kerberos\"]"
- },
+ "druid.security.extensions.loadList": "[\"druid-kerberos\"]"
+ }
+ },
+ {
"druid-superset": {
- "ENABLE_KERBEROS_AUTHENTICATION" : "True",
- "KERBEROS_REINIT_TIME_SEC" : 3600
+ "ENABLE_KERBEROS_AUTHENTICATION": "True",
+ "KERBEROS_REINIT_TIME_SEC": "3600"
}
}
],
- "auth_to_local_properties" : [
+ "auth_to_local_properties": [
"druid-common/druid.hadoop.security.spnego.authToLocal|new_lines_escaped"
]
}