ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject ambari git commit: AMBARI-19230. Ambari does not select correct heap size for HSIHS2 (smohanty)
Date Mon, 19 Dec 2016 05:16:44 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 f2618b485 -> 904ff8d3e


AMBARI-19230. Ambari does not select correct heap size for HSIHS2 (smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/904ff8d3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/904ff8d3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/904ff8d3

Branch: refs/heads/branch-2.5
Commit: 904ff8d3efacd841430559c9300d2fdbfa438f69
Parents: f2618b4
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Sun Dec 18 21:16:26 2016 -0800
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Sun Dec 18 21:16:26 2016 -0800

----------------------------------------------------------------------
 .../common-services/HDFS/3.0.0.3.0/package/scripts/utils.py   | 5 +++--
 .../HIVE/0.12.0.2.0/package/scripts/params_linux.py           | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/904ff8d3/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/utils.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/utils.py
b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/utils.py
index 4577ad2..f76935a 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/utils.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/utils.py
@@ -34,10 +34,11 @@ from resource_management.libraries.functions.curl_krb_request import curl_krb_re
 from resource_management.core.exceptions import Fail
 from resource_management.libraries.functions.namenode_ha_utils import get_namenode_states
 from resource_management.libraries.functions.show_logs import show_logs
-from ambari_commons.inet_utils import ensure_ssl_using_tls_v1
+from resource_management.libraries.script.script import Script
+from ambari_commons.inet_utils import ensure_ssl_using_protocol
 from zkfc_slave import ZkfcSlaveDefault
 
-ensure_ssl_using_tls_v1()
+ensure_ssl_using_protocol(Script.get_force_https_protocol())
 
 def safe_zkfc_op(action, env):
   """

http://git-wip-us.apache.org/repos/asf/ambari/blob/904ff8d3/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
index 0ac0608..61034cf 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
@@ -404,7 +404,7 @@ start_metastore_path = format("{tmp_dir}/start_metastore_script")
 
 hadoop_heapsize = config['configurations']['hadoop-env']['hadoop_heapsize']
 
-if 'role' in config and config['role'] in ["HIVE_SERVER", "HIVE_METASTORE"]:
+if 'role' in config and config['role'] in ["HIVE_SERVER", "HIVE_METASTORE", "HIVE_SERVER_INTERACTIVE"]:
   if check_stack_feature(StackFeature.HIVE_ENV_HEAPSIZE, version_for_stack_feature_checks):
     hive_heapsize = config['configurations']['hive-env']['hive.heapsize']
   else:
@@ -594,7 +594,10 @@ if has_hive_interactive:
   hive_interactive_env_sh_template = config['configurations']['hive-interactive-env']['content']
   hive_interactive_enabled = default('/configurations/hive-interactive-env/enable_hive_interactive',
False)
   llap_app_java_opts = default('/configurations/hive-interactive-env/llap_java_opts', '-XX:+AlwaysPreTouch
{% if java_version > 7 %}-XX:+UseG1GC -XX:TLABSize=8m -XX:+ResizeTLAB -XX:+UseNUMA -XX:+AggressiveOpts
-XX:MetaspaceSize=1024m -XX:InitiatingHeapOccupancyPercent=80 -XX:MaxGCPauseMillis=200{% else
%}-XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseParallelGC{%
endif %}')
-  hive_interactive_heapsize = config['configurations']['hive-interactive-env']['hive_heapsize']
+  hive_interactive_heapsize = hive_heapsize
+  # Ambari upgrade may not add this config as it will force restart of HSI (stack upgrade
should)
+  if 'hive_heapsize' in config['configurations']['hive-interactive-env']:
+    hive_interactive_heapsize = config['configurations']['hive-interactive-env']['hive_heapsize']
 
   # Service check related
   if hive_transport_mode.lower() == "http":


Mime
View raw message