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 2011/03/14 07:28:40 UTC
svn commit: r1081267 - in /incubator/whirr/trunk: ./
services/hadoop/src/main/java/org/apache/whirr/service/hadoop/
services/hadoop/src/test/java/org/apache/whirr/service/hadoop/
Author: asavu
Date: Mon Mar 14 06:28:39 2011
New Revision: 1081267
URL: http://svn.apache.org/viewvc?rev=1081267&view=rev
Log:
WHIRR-259. Disable configuration list handling for Hadoop properties
Modified:
incubator/whirr/trunk/CHANGES.txt
incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverter.java
incubator/whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverterTest.java
Modified: incubator/whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/CHANGES.txt?rev=1081267&r1=1081266&r2=1081267&view=diff
==============================================================================
--- incubator/whirr/trunk/CHANGES.txt (original)
+++ incubator/whirr/trunk/CHANGES.txt Mon Mar 14 06:28:39 2011
@@ -51,6 +51,9 @@ Trunk (unreleased changes)
WHIRR-254. Document limitation that a role may only appear in
one instance template group (tomwhite via asavu)
+ WHIRR-259. Disable configuration list handling for Hadoop
+ properties (asavu)
+
BUG FIXES
WHIRR-170. Instances should be started in the order specified in
Modified: incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverter.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverter.java?rev=1081267&r1=1081266&r2=1081267&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverter.java (original)
+++ incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverter.java Mon Mar 14 06:28:39 2011
@@ -24,7 +24,9 @@ import com.google.common.collect.Lists;
import java.util.Iterator;
import java.util.List;
+import org.apache.commons.configuration.AbstractConfiguration;
import org.apache.commons.configuration.Configuration;
+import org.apache.commons.lang.StringUtils;
import org.jclouds.scriptbuilder.domain.Statement;
import org.jclouds.scriptbuilder.domain.Statements;
@@ -45,7 +47,10 @@ public class HadoopConfigurationConverte
if (key.endsWith(FINAL_SUFFIX)) {
continue;
}
- Object value = hadoopConfig.getProperty(key);
+
+ // rebuild the original value by joining all of them with the default separator
+ String value = StringUtils.join(hadoopConfig.getStringArray(key),
+ AbstractConfiguration.getDefaultListDelimiter());
lines.add(" <property>");
lines.add(String.format(" <name>%s</name>", key));
lines.add(String.format(" <value>%s</value>", value));
Modified: incubator/whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverterTest.java?rev=1081267&r1=1081266&r2=1081267&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverterTest.java (original)
+++ incubator/whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverterTest.java Mon Mar 14 06:28:39 2011
@@ -34,18 +34,18 @@ public class HadoopConfigurationConverte
@Test
public void testConversion() {
Configuration conf = new PropertiesConfiguration();
- conf.setProperty("p1", "v1");
- conf.setProperty("p2", "v2");
+ conf.setProperty("p1", "v1,v2");
+ conf.setProperty("p2", "v3");
List<String> lines = HadoopConfigurationConverter.asLinesInFile(conf);
assertThat(lines, is((List<String>) Lists.newArrayList(
"<configuration>",
" <property>",
" <name>p1</name>",
- " <value>v1</value>",
+ " <value>v1,v2</value>",
" </property>",
" <property>",
" <name>p2</name>",
- " <value>v2</value>",
+ " <value>v3</value>",
" </property>",
"</configuration>"
)));