Repository: ambari Updated Branches: refs/heads/trunk bf6cdf5e4 -> 1524c9bce
AMBARI-5146. After Ambari is upgraded to 1.5.0, previous JAVA_HOME is overwritten to /usr/jdk64/jdk1.6.0_3 (Vitaly Brodetskyi via dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1524c9bc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1524c9bc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1524c9bc Branch: refs/heads/trunk Commit: 1524c9bce6d4ce066e45b143c24a82c0b1043176 Parents: bf6cdf5 Author: Lisnichenko Dmitro <[email protected]> Authored: Wed Mar 19 22:09:04 2014 +0200 Committer: Lisnichenko Dmitro <[email protected]> Committed: Wed Mar 19 22:09:04 2014 +0200 ---------------------------------------------------------------------- .../stacks/HDP/1.3.2/hooks/before-START/scripts/hook.py | 1 + .../1.3.2/hooks/before-START/scripts/shared_initialization.py | 6 ++++++ .../stacks/HDP/2.0.6/hooks/before-START/scripts/hook.py | 1 + .../2.0.6/hooks/before-START/scripts/shared_initialization.py | 6 ++++++ 4 files changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1524c9bc/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/hook.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/hook.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/hook.py index e11bfac..4ee2214 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/hook.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/hook.py @@ -32,6 +32,7 @@ class BeforeConfigureHook(Hook): setup_java() setup_hadoop() setup_configs() + create_javahome_symlink() if __name__ == "__main__": BeforeConfigureHook().execute() http://git-wip-us.apache.org/repos/asf/ambari/blob/1524c9bc/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/shared_initialization.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/shared_initialization.py index 89b29c6..c5828d3 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/shared_initialization.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/shared_initialization.py @@ -303,3 +303,9 @@ def install_snappy(): format("mkdir -p {so_target_dir_x86}; ln -sf {so_src_x86} {so_target_x86}")) Execute( format("mkdir -p {so_target_dir_x64}; ln -sf {so_src_x64} {so_target_x64}")) + + +def create_javahome_symlink(): + if os.path.exists("/usr/jdk/jdk1.6.0_31") and not os.path.exists("/usr/jdk64/jdk1.6.0_31"): + Execute("mkdir -p /usr/jdk64/") + Execute("ln -s /usr/jdk/jdk1.6.0_31 /usr/jdk64/jdk1.6.0_31") http://git-wip-us.apache.org/repos/asf/ambari/blob/1524c9bc/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/hook.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/hook.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/hook.py index e11bfac..4ee2214 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/hook.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/hook.py @@ -32,6 +32,7 @@ class BeforeConfigureHook(Hook): setup_java() setup_hadoop() setup_configs() + create_javahome_symlink() if __name__ == "__main__": BeforeConfigureHook().execute() http://git-wip-us.apache.org/repos/asf/ambari/blob/1524c9bc/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py index a8d2fa3..3ffcc76 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py @@ -309,3 +309,9 @@ def install_snappy(): format("mkdir -p {so_target_dir_x86}; ln -sf {so_src_x86} {so_target_x86}")) Execute( format("mkdir -p {so_target_dir_x64}; ln -sf {so_src_x64} {so_target_x64}")) + + +def create_javahome_symlink(): + if os.path.exists("/usr/jdk/jdk1.6.0_31") and not os.path.exists("/usr/jdk64/jdk1.6.0_31"): + Execute("mkdir -p /usr/jdk64/") + Execute("ln -s /usr/jdk/jdk1.6.0_31 /usr/jdk64/jdk1.6.0_31") \ No newline at end of file
