[bigtop] branch master updated: BIGTOP-3592: Remove Ambari stack-select tool dependency from stack hooks (#825)

[guyuqi]

This is an automated email from the ASF dual-hosted git repository.

guyuqi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/master by this push:
     new 1c1eed9  BIGTOP-3592: Remove Ambari stack-select tool dependency from 
stack hooks (#825)
1c1eed9 is described below

commit 1c1eed9deab5aad4c713bc7afac47879b6407829
Author: Yuqi Gu <yuqi...@arm.com>
AuthorDate: Thu Nov 4 18:01:46 2021 +0800

    BIGTOP-3592: Remove Ambari stack-select tool dependency from stack hooks 
(#825)
    
    Change-Id: I8c34031fc8d21a6d908153f21b85e61b55b5a300
    Signed-off-by: Yuqi Gu <yuqi...@arm.com>
---
 .../src/common/ambari/patch8-stack-hooks.diff      | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/bigtop-packages/src/common/ambari/patch8-stack-hooks.diff 
b/bigtop-packages/src/common/ambari/patch8-stack-hooks.diff
new file mode 100644
index 0000000..ab85aec
--- /dev/null
+++ b/bigtop-packages/src/common/ambari/patch8-stack-hooks.diff
@@ -0,0 +1,23 @@
+diff --git 
a/ambari-server/src/main/resources/stack-hooks/after-INSTALL/scripts/shared_initialization.py
 
b/ambari-server/src/main/resources/stack-hooks/after-INSTALL/scripts/shared_initialization.py
+index ca3cdc64b1..ef6cc10655 100644
+--- 
a/ambari-server/src/main/resources/stack-hooks/after-INSTALL/scripts/shared_initialization.py
++++ 
b/ambari-server/src/main/resources/stack-hooks/after-INSTALL/scripts/shared_initialization.py
+@@ -49,11 +49,6 @@ def setup_stack_symlinks(struct_out_file):
+     Logger.warning("Skipping running stack-selector-tool because this is a 
sys_prepped host. This may cause symlink pointers not to be created for HDP 
components installed later on top of an already sys_prepped host")
+     return
+ 
+-  # get the packages which the stack-select tool should be used on
+-  stack_packages = 
stack_select.get_packages(stack_select.PACKAGE_SCOPE_INSTALL)
+-  if stack_packages is None:
+-    return
+-
+   json_version = load_version(struct_out_file)
+ 
+   if not json_version:
+@@ -145,4 +140,4 @@ def link_configs(struct_out_file):
+     with open(params.conf_select_marker_file, "wb") as fp:
+       pass
+   else:
+-    Logger.info(format("Skipping conf-select stage, since 
cluster-env/sysprep_skip_conf_select is set and mark file 
{conf_select_marker_file} exists"))
+\ No newline at end of file
++    Logger.info(format("Skipping conf-select stage, since 
cluster-env/sysprep_skip_conf_select is set and mark file 
{conf_select_marker_file} exists"))