Repository: ambari Updated Branches: refs/heads/trunk 0b2bc6f58 -> 3e8abab8f
AMBARI-15685. Ambari should verify JAVA_HOME Consistency (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3e8abab8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3e8abab8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3e8abab8 Branch: refs/heads/trunk Commit: 3e8abab8ff258fe11e8423e149816ac038c342ac Parents: 0b2bc6f Author: Andrew Onishuk <[email protected]> Authored: Mon Apr 4 18:51:14 2016 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Mon Apr 4 18:51:14 2016 +0300 ---------------------------------------------------------------------- .../HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3e8abab8/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py index ed6c36c..8770df9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py @@ -177,13 +177,12 @@ def setup_java(): java_exec = format("{java_home}/bin/java") if not os.path.isfile(java_exec): + if not params.jdk_name: # if custom jdk is used. + raise Fail(format("Unable to access {java_exec}. Confirm you have copied jdk to this host.")) jdk_curl_target = format("{tmp_dir}/{jdk_name}") java_dir = os.path.dirname(params.java_home) - if not params.jdk_name: - return - Directory(params.artifact_dir, create_parents = True, )
