ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adorosz...@apache.org
Subject ambari git commit: AMBARI-21469. Stop Spark fails due to missing stack selector
Date Thu, 13 Jul 2017 21:06:11 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 33c279cf2 -> 7dbcb7542


AMBARI-21469. Stop Spark fails due to missing stack selector


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

Branch: refs/heads/branch-2.5
Commit: 7dbcb7542e0d6d58fe11b6549e3c2c07574258a6
Parents: 33c279c
Author: Attila Doroszlai <adoroszlai@hortonworks.com>
Authored: Thu Jul 13 21:40:27 2017 +0200
Committer: Attila Doroszlai <adoroszlai@hortonworks.com>
Committed: Thu Jul 13 21:40:27 2017 +0200

----------------------------------------------------------------------
 .../BigInsights/4.2/services/HBASE/package/scripts/params.py    | 4 ++--
 .../BigInsights/4.2/services/SPARK/package/scripts/params.py    | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/7dbcb754/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/package/scripts/params.py
index 9b61674..2c672aa 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/package/scripts/params.py
@@ -97,10 +97,10 @@ master_heapsize = treat_value_as_mb(master_heapsize_cfg)
 
 hbase_javaopts_properties = config['configurations']['hbase-javaopts-properties']['content']
 
-iop_full_version = get_iop_version()
-
 hbase_javaopts_properties = str(hbase_javaopts_properties)	
 if hbase_javaopts_properties.find('-Diop.version') == -1:
+  current_version = default("/hostLevelParams/current_version", None)
+  iop_full_version = format_stack_version(current_version)
   hbase_javaopts_properties = hbase_javaopts_properties+ ' -Diop.version=' + str(iop_full_version)
 
 regionserver_heapsize = ensure_unit_for_memory(config['configurations']['hbase-env']['hbase_regionserver_heapsize'])

http://git-wip-us.apache.org/repos/asf/ambari/blob/7dbcb754/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SPARK/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SPARK/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SPARK/package/scripts/params.py
index 6d51b57..8ec5af8 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SPARK/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SPARK/package/scripts/params.py
@@ -22,6 +22,7 @@ from resource_management.libraries.functions.default import default
 from resource_management import *
 from resource_management.libraries.functions import conf_select
 from resource_management.libraries.functions import stack_select
+from resource_management.libraries.functions.version import format_stack_version
 from spark import *
 import status_params
 
@@ -39,7 +40,9 @@ component_directory = Script.get_component_from_role(SERVER_ROLE_DIRECTORY_MAP,
 
 config = Script.get_config()
 tmp_dir = Script.get_tmp_dir()
-iop_full_version = get_iop_version()
+
+current_version = default("/hostLevelParams/current_version", None)
+iop_full_version = format_stack_version(current_version)
 
 # New Cluster Stack Version that is defined during the RESTART of a Rolling Upgrade
 version = default("/commandParams/version", None)


Mime
View raw message