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/21 14:28:58 UTC
svn commit: r1291770 -
/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverter.java
Author: asavu
Date: Tue Feb 21 13:28:58 2012
New Revision: 1291770
URL: http://svn.apache.org/viewvc?rev=1291770&view=rev
Log:
WHIRR-518. Make sure JAVA_HOME is set for the Hadoop cluster
Modified:
whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverter.java
Modified: whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverter.java
URL: http://svn.apache.org/viewvc/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverter.java?rev=1291770&r1=1291769&r2=1291770&view=diff
==============================================================================
--- whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverter.java (original)
+++ whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverter.java Tue Feb 21 13:28:58 2012
@@ -34,7 +34,7 @@ import static org.jclouds.scriptbuilder.
* Helper class to convert between Hadoop configuration representations.
*/
public class HadoopConfigurationConverter {
-
+
private static final String FINAL_SUFFIX = ".final";
@VisibleForTesting
@@ -63,8 +63,8 @@ public class HadoopConfigurationConverte
lines.add("</configuration>");
return lines;
}
-
- public static Statement asCreateXmlConfigurationFileStatement(String path,
+
+ public static Statement asCreateXmlConfigurationFileStatement(String path,
Configuration hadoopConfig) {
return createOrOverwriteFile(path, asXmlConfigurationLines(hadoopConfig));
}
@@ -72,7 +72,8 @@ public class HadoopConfigurationConverte
@VisibleForTesting
static List<String> asEnvironmentVariablesLines(Configuration hadoopConfig) {
List<String> lines = Lists.newArrayList();
-
+ lines.add("source /etc/profile");
+
for (@SuppressWarnings("unchecked")
Iterator<String> it = hadoopConfig.getKeys(); it.hasNext(); ) {
String key = it.next();
@@ -90,10 +91,10 @@ public class HadoopConfigurationConverte
}
return lines;
}
-
- public static Statement asCreateEnvironmentVariablesFileStatement(String path,
+
+ public static Statement asCreateEnvironmentVariablesFileStatement(String path,
Configuration config) {
return createOrOverwriteFile(path, asEnvironmentVariablesLines(config));
}
-
+
}