openstack/deb-sahara
Code Issues Proposed changes

[HDP] java64_home not pointing at default-installed JDK for plugin

Browse Source 
At this time HDP's java64_home property defaults to /opt/jdk1.6.0_31.
However, the now-default openjdk element installs to /usr/lib/jvm/java-openjdk.
If nodes are connected to the internet at cluster spinup time, this does not
cause an overt error, but querying for JDK location will return error code 2,
resulting in no -j argument being passed to 'ambari-server setup -s', which in
turn will result in a download of Oracle's JDK and successful installation. In
the case that the nodes cannot connect to the internet (which should be a
success case with a pre-installed VM image,) cluster creation fails at this
stage.

This patch updates java64_home to the default JAVA_HOME from the openjdk
element.

Change-Id: I1d53db67341626190e7240f0ae4165f91d364a2c
Closes-bug: 1453165
This commit is contained in:
Ethan Gafford 2015-05-08 10:30:30 -04:00
parent 878e4b3aa3
commit 23cb825c0d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sahara/plugins/hdp/versions/version_1_3_2/resources/default-cluster.template
View File

@ -279,7 +279,7 @@
{ {
"name" : "global", "name" : "global",
"properties" : [ "properties" : [
{ "name" : "java64_home", "value" : "/opt/jdk1.6.0_31" }, { "name" : "java64_home", "value" : "/usr/lib/jvm/java-openjdk" },
{ "name" : "dfs_name_dir", "value" : "/mnt/hadoop/hdfs/namenode" }, { "name" : "dfs_name_dir", "value" : "/mnt/hadoop/hdfs/namenode" },
{ "name" : "fs_checkpoint_dir", "value" : "/hadoop/hdfs/namesecondary" }, { "name" : "fs_checkpoint_dir", "value" : "/hadoop/hdfs/namesecondary" },
{ "name" : "dfs_data_dir", "value" : "/hadoop/hdfs/data" }, { "name" : "dfs_data_dir", "value" : "/hadoop/hdfs/data" },

2
sahara/plugins/hdp/versions/version_2_0_6/resources/default-cluster.template
View File

@ -318,7 +318,7 @@
"properties" : [ "properties" : [
{ {
"name" : "java64_home", "name" : "java64_home",
"value" : "/opt/jdk1.6.0_31" }, "value" : "/usr/lib/jvm/java-openjdk" },
{ {
"name": "security_enabled", "name": "security_enabled",
"value": "false" "value": "false"