You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whirr.apache.org by as...@apache.org on 2012/02/20 23:47:34 UTC
svn commit: r1291501 - in /whirr/branches/branch-0.7: ./
core/src/main/resources/functions/
services/cassandra/src/main/java/org/apache/whirr/service/cassandra/
services/elasticsearch/src/main/java/org/apache/whirr/service/elasticsearch/
services/hadoo...
Author: asavu
Date: Mon Feb 20 22:47:34 2012
New Revision: 1291501
URL: http://svn.apache.org/viewvc?rev=1291501&view=rev
Log:
WHIRR-454. Allow openjdk to be installed as an alternative to sun-java-6 (Karel Vervaeke via asavu)
Added:
whirr/branches/branch-0.7/core/src/main/resources/functions/install_openjdk.sh
Modified:
whirr/branches/branch-0.7/CHANGES.txt
whirr/branches/branch-0.7/services/cassandra/src/main/java/org/apache/whirr/service/cassandra/CassandraClusterActionHandler.java
whirr/branches/branch-0.7/services/elasticsearch/src/main/java/org/apache/whirr/service/elasticsearch/ElasticSearchHandler.java
whirr/branches/branch-0.7/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopClusterActionHandler.java
whirr/branches/branch-0.7/services/hama/src/main/java/org/apache/whirr/service/hama/HamaClusterActionHandler.java
whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/BasicServerClusterActionHandler.java
whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseMasterClusterActionHandler.java
whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseRegionServerClusterActionHandler.java
whirr/branches/branch-0.7/services/voldemort/src/main/java/org/apache/whirr/service/voldemort/VoldemortClusterActionHandler.java
whirr/branches/branch-0.7/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java
Modified: whirr/branches/branch-0.7/CHANGES.txt
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/CHANGES.txt?rev=1291501&r1=1291500&r2=1291501&view=diff
==============================================================================
--- whirr/branches/branch-0.7/CHANGES.txt (original)
+++ whirr/branches/branch-0.7/CHANGES.txt Mon Feb 20 22:47:34 2012
@@ -12,6 +12,9 @@ Release 0.7.1
WHIRR-498. Update the list of known limitations (asavu)
WHIRR-463. Fail fast when running as root (asavu)
+
+ WHIRR-454. Allow openjdk to be installed as an alternative
+ to sun-java-6 (Karel Vervaeke via asavu)
BUG FIXES
Added: whirr/branches/branch-0.7/core/src/main/resources/functions/install_openjdk.sh
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/core/src/main/resources/functions/install_openjdk.sh?rev=1291501&view=auto
==============================================================================
--- whirr/branches/branch-0.7/core/src/main/resources/functions/install_openjdk.sh (added)
+++ whirr/branches/branch-0.7/core/src/main/resources/functions/install_openjdk.sh Mon Feb 20 22:47:34 2012
@@ -0,0 +1,46 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+function install_openjdk_deb() {
+ apt-get update
+ apt-get -y install openjdk-6-jdk
+
+ export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+ echo "export JAVA_HOME=$JAVA_HOME" >> /etc/profile
+ echo "export JAVA_HOME=$JAVA_HOME" >> ~root/.bashrc
+ # TODO: update-alternatives?
+ java -version
+
+}
+
+function install_openjdk_rpm() {
+ yum install java-1.6.0-openjdk
+
+ export JAVA_HOME=/usr/lib/jvm/java-1.6.0-openjdk
+ echo "export JAVA_HOME=$JAVA_HOME" >> /etc/profile
+ echo "export JAVA_HOME=$JAVA_HOME" >> ~root/.bashrc
+ alternatives --install /usr/bin/java java $JAVA_HOME/bin/java 17000
+ alternatives --set java $JAVA_HOME/bin/java
+ java -version
+}
+
+function install_openjdk() {
+ if which dpkg &> /dev/null; then
+ install_openjdk_deb
+ elif which rpm &> /dev/null; then
+ install_openjdk_rpm
+ fi
+}
Modified: whirr/branches/branch-0.7/services/cassandra/src/main/java/org/apache/whirr/service/cassandra/CassandraClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/cassandra/src/main/java/org/apache/whirr/service/cassandra/CassandraClusterActionHandler.java?rev=1291501&r1=1291500&r2=1291501&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/cassandra/src/main/java/org/apache/whirr/service/cassandra/CassandraClusterActionHandler.java (original)
+++ whirr/branches/branch-0.7/services/cassandra/src/main/java/org/apache/whirr/service/cassandra/CassandraClusterActionHandler.java Mon Feb 20 22:47:34 2012
@@ -22,6 +22,8 @@ import static org.apache.whirr.RolePredi
import static org.apache.whirr.service.FirewallManager.Rule;
import static org.jclouds.scriptbuilder.domain.Statements.call;
+import org.apache.whirr.ClusterSpec;
+
import com.google.common.base.Function;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
@@ -52,13 +54,16 @@ public class CassandraClusterActionHandl
@Override
protected void beforeBootstrap(ClusterActionEvent event) throws IOException {
- addStatement(event, call("install_java"));
+ ClusterSpec clusterSpec = event.getClusterSpec();
+ Configuration conf = clusterSpec.getConfiguration();
+
+ addStatement(event, call(getInstallFunction(conf, "java", "install_java")));
addStatement(event, call("install_tarball"));
addStatement(event, call("install_service"));
addStatement(event, call("remove_service"));
- Configuration config = event.getClusterSpec().getConfiguration();
+ Configuration config = clusterSpec.getConfiguration();
String tarball = prepareRemoteFileUrl(event, config.getString(BIN_TARBALL, null));
String major = config.getString(MAJOR_VERSION, null);
Modified: whirr/branches/branch-0.7/services/elasticsearch/src/main/java/org/apache/whirr/service/elasticsearch/ElasticSearchHandler.java
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/elasticsearch/src/main/java/org/apache/whirr/service/elasticsearch/ElasticSearchHandler.java?rev=1291501&r1=1291500&r2=1291501&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/elasticsearch/src/main/java/org/apache/whirr/service/elasticsearch/ElasticSearchHandler.java (original)
+++ whirr/branches/branch-0.7/services/elasticsearch/src/main/java/org/apache/whirr/service/elasticsearch/ElasticSearchHandler.java Mon Feb 20 22:47:34 2012
@@ -46,7 +46,7 @@ public class ElasticSearchHandler extend
ClusterSpec spec = event.getClusterSpec();
Configuration config = spec.getConfiguration();
- addStatement(event, call("install_java"));
+ addStatement(event, call(getInstallFunction(config, "java", "install_java")));
addStatement(event, call("install_tarball"));
String tarurl = prepareRemoteFileUrl(event,
Modified: whirr/branches/branch-0.7/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopClusterActionHandler.java?rev=1291501&r1=1291500&r2=1291501&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopClusterActionHandler.java (original)
+++ whirr/branches/branch-0.7/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopClusterActionHandler.java Mon Feb 20 22:47:34 2012
@@ -63,11 +63,11 @@ public abstract class HadoopClusterActio
@Override
protected void beforeBootstrap(ClusterActionEvent event) throws IOException {
ClusterSpec clusterSpec = event.getClusterSpec();
-
Configuration conf = getConfiguration(clusterSpec);
+
addStatement(event, call("configure_hostnames"));
- addStatement(event, call("install_java"));
+ addStatement(event, call(getInstallFunction(conf, "java", "install_java")));
addStatement(event, call("install_tarball"));
String tarball = prepareRemoteFileUrl(event,
Modified: whirr/branches/branch-0.7/services/hama/src/main/java/org/apache/whirr/service/hama/HamaClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/hama/src/main/java/org/apache/whirr/service/hama/HamaClusterActionHandler.java?rev=1291501&r1=1291500&r2=1291501&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/hama/src/main/java/org/apache/whirr/service/hama/HamaClusterActionHandler.java (original)
+++ whirr/branches/branch-0.7/services/hama/src/main/java/org/apache/whirr/service/hama/HamaClusterActionHandler.java Mon Feb 20 22:47:34 2012
@@ -43,15 +43,16 @@ public abstract class HamaClusterActionH
protected void beforeBootstrap(ClusterActionEvent event) throws IOException {
ClusterSpec clusterSpec = event.getClusterSpec();
+ Configuration conf = getConfiguration(clusterSpec);
addStatement(event, call("configure_hostnames"));
- addStatement(event, call("install_java"));
+ addStatement(event, call(getInstallFunction(conf, "java", "install_java")));
addStatement(event, call("install_tarball"));
- String hamaInstallFunction = getConfiguration(clusterSpec).getString(
+ String hamaInstallFunction = conf.getString(
HamaConstants.KEY_INSTALL_FUNCTION, HamaConstants.FUNCTION_INSTALL);
- String tarurl = prepareRemoteFileUrl(event, getConfiguration(clusterSpec)
+ String tarurl = prepareRemoteFileUrl(event, conf
.getString(HamaConstants.KEY_TARBALL_URL));
addStatement(event,
Modified: whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/BasicServerClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/BasicServerClusterActionHandler.java?rev=1291501&r1=1291500&r2=1291501&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/BasicServerClusterActionHandler.java (original)
+++ whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/BasicServerClusterActionHandler.java Mon Feb 20 22:47:34 2012
@@ -22,6 +22,8 @@ import static org.apache.whirr.RolePredi
import static org.apache.whirr.service.FirewallManager.Rule;
import static org.jclouds.scriptbuilder.domain.Statements.call;
+import org.apache.commons.configuration.Configuration;
+
import java.io.IOException;
import java.net.InetAddress;
@@ -53,16 +55,17 @@ public class BasicServerClusterActionHan
@Override
protected void beforeBootstrap(ClusterActionEvent event) throws IOException {
ClusterSpec clusterSpec = event.getClusterSpec();
+ Configuration conf = getConfiguration(clusterSpec);
addStatement(event, call("configure_hostnames"));
- addStatement(event, call("install_java"));
+ addStatement(event, call(getInstallFunction(conf, "java", "install_java")));
addStatement(event, call("install_tarball"));
String tarurl = prepareRemoteFileUrl(event,
- getConfiguration(clusterSpec).getString(HBaseConstants.KEY_TARBALL_URL));
+ conf.getString(HBaseConstants.KEY_TARBALL_URL));
addStatement(event, call(
- getInstallFunction(getConfiguration(clusterSpec)),
+ getInstallFunction(conf),
HBaseConstants.PARAM_TARBALL_URL, tarurl)
);
}
Modified: whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseMasterClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseMasterClusterActionHandler.java?rev=1291501&r1=1291500&r2=1291501&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseMasterClusterActionHandler.java (original)
+++ whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseMasterClusterActionHandler.java Mon Feb 20 22:47:34 2012
@@ -62,10 +62,11 @@ public class HBaseMasterClusterActionHan
@Override
protected void beforeBootstrap(ClusterActionEvent event) throws IOException {
ClusterSpec clusterSpec = event.getClusterSpec();
+ Configuration conf = getConfiguration(clusterSpec);
addStatement(event, call("configure_hostnames"));
- addStatement(event, call("install_java"));
+ addStatement(event, call(getInstallFunction(conf, "java", "install_java")));
addStatement(event, call("install_tarball"));
String tarurl = prepareRemoteFileUrl(event,
Modified: whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseRegionServerClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseRegionServerClusterActionHandler.java?rev=1291501&r1=1291500&r2=1291501&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseRegionServerClusterActionHandler.java (original)
+++ whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseRegionServerClusterActionHandler.java Mon Feb 20 22:47:34 2012
@@ -50,10 +50,11 @@ public class HBaseRegionServerClusterAct
@Override
protected void beforeBootstrap(ClusterActionEvent event) throws IOException {
ClusterSpec clusterSpec = event.getClusterSpec();
+ Configuration conf = getConfiguration(clusterSpec);
addStatement(event, call("configure_hostnames"));
- addStatement(event, call("install_java"));
+ addStatement(event, call(getInstallFunction(conf, "java", "install_java")));
addStatement(event, call("install_tarball"));
String tarurl = prepareRemoteFileUrl(event,
Modified: whirr/branches/branch-0.7/services/voldemort/src/main/java/org/apache/whirr/service/voldemort/VoldemortClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/voldemort/src/main/java/org/apache/whirr/service/voldemort/VoldemortClusterActionHandler.java?rev=1291501&r1=1291500&r2=1291501&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/voldemort/src/main/java/org/apache/whirr/service/voldemort/VoldemortClusterActionHandler.java (original)
+++ whirr/branches/branch-0.7/services/voldemort/src/main/java/org/apache/whirr/service/voldemort/VoldemortClusterActionHandler.java Mon Feb 20 22:47:34 2012
@@ -79,7 +79,7 @@ public class VoldemortClusterActionHandl
optArgs.add(prepareRemoteFileUrl(event, confUrl));
}
- addStatement(event, call("install_java"));
+ addStatement(event, call(getInstallFunction(config, "java", "install_java")));
addStatement(event, call("install_service"));
addStatement(event, call(FUNCTION_INSTALL, optArgs.toArray(new String[optArgs.size()])));
Modified: whirr/branches/branch-0.7/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java?rev=1291501&r1=1291500&r2=1291501&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java (original)
+++ whirr/branches/branch-0.7/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java Mon Feb 20 22:47:34 2012
@@ -73,7 +73,7 @@ public class ZooKeeperClusterActionHandl
ClusterSpec clusterSpec = event.getClusterSpec();
Configuration config = getConfiguration(clusterSpec);
- addStatement(event, call("install_java"));
+ addStatement(event, call(getInstallFunction(config, "java", "install_java")));
addStatement(event, call("install_tarball"));
addStatement(event, call("install_service"));