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/06/16 21:43:30 UTC
svn commit: r1136624 - in /incubator/whirr/trunk: CHANGES.txt
core/src/main/java/org/apache/whirr/actions/ByonClusterAction.java
services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationBuilder.java
Author: asavu
Date: Thu Jun 16 19:43:29 2011
New Revision: 1136624
URL: http://svn.apache.org/viewvc?rev=1136624&view=rev
Log:
WHIRR-330. BYON doesn't work with HadoopConfigurationBuilder (John Amos and asavu)
Modified:
incubator/whirr/trunk/CHANGES.txt
incubator/whirr/trunk/core/src/main/java/org/apache/whirr/actions/ByonClusterAction.java
incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationBuilder.java
Modified: incubator/whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/CHANGES.txt?rev=1136624&r1=1136623&r2=1136624&view=diff
==============================================================================
--- incubator/whirr/trunk/CHANGES.txt (original)
+++ incubator/whirr/trunk/CHANGES.txt Thu Jun 16 19:43:29 2011
@@ -31,6 +31,9 @@ Trunk (unreleased changes)
WHIRR-249. Firewall authorization should be idempotent (asavu)
+ WHIRR-330. BYON doesn't work with HadoopConfigurationBuilder
+ (John Amos and asavu)
+
Release 0.5.0 - 2011-05-16
INCOMPATIBLE CHANGES
Modified: incubator/whirr/trunk/core/src/main/java/org/apache/whirr/actions/ByonClusterAction.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/src/main/java/org/apache/whirr/actions/ByonClusterAction.java?rev=1136624&r1=1136623&r2=1136624&view=diff
==============================================================================
--- incubator/whirr/trunk/core/src/main/java/org/apache/whirr/actions/ByonClusterAction.java (original)
+++ incubator/whirr/trunk/core/src/main/java/org/apache/whirr/actions/ByonClusterAction.java Thu Jun 16 19:43:29 2011
@@ -144,7 +144,7 @@ public class ByonClusterAction extends S
@Override
public Instance apply(NodeMetadata node) {
String publicIp = Iterables.get(node.getPublicAddresses(), 0);
- return new Instance(credentials, roles, publicIp, publicIp, node.getId(), null);
+ return new Instance(credentials, roles, publicIp, publicIp, node.getId(), node);
}
}));
}
Modified: incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationBuilder.java?rev=1136624&r1=1136623&r2=1136624&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationBuilder.java (original)
+++ incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationBuilder.java Thu Jun 16 19:43:29 2011
@@ -105,19 +105,24 @@ public class HadoopConfigurationBuilder
Hardware hardware = Iterables.getFirst(taskTrackers, null)
.getNodeMetadata().getHardware();
- int coresPerNode = 0;
- for (Processor processor : hardware.getProcessors()) {
- coresPerNode += processor.getCores();
+
+ /* null when using the BYON jclouds compute provider */
+ if (hardware != null) {
+
+ int coresPerNode = 0;
+ for (Processor processor : hardware.getProcessors()) {
+ coresPerNode += processor.getCores();
+ }
+ int mapTasksPerNode = (int) Math.ceil(coresPerNode * 1.0);
+ int reduceTasksPerNode = (int) Math.ceil(coresPerNode * 0.75);
+
+ setIfAbsent(config, "mapred.tasktracker.map.tasks.maximum", mapTasksPerNode + "");
+ setIfAbsent(config, "mapred.tasktracker.reduce.tasks.maximum", reduceTasksPerNode + "");
+
+ int clusterReduceSlots = taskTrackers.size() * reduceTasksPerNode;
+ setIfAbsent(config, "mapred.reduce.tasks", clusterReduceSlots + "");
+
}
- int mapTasksPerNode = (int) Math.ceil(coresPerNode * 1.0);
- int reduceTasksPerNode = (int) Math.ceil(coresPerNode * 0.75);
-
- setIfAbsent(config, "mapred.tasktracker.map.tasks.maximum", mapTasksPerNode + "");
- setIfAbsent(config, "mapred.tasktracker.reduce.tasks.maximum", reduceTasksPerNode + "");
-
- int clusterReduceSlots = taskTrackers.size() * reduceTasksPerNode;
- setIfAbsent(config, "mapred.reduce.tasks", clusterReduceSlots + "");
-
}
Instance jobtracker = cluster