You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2011/06/05 10:21:10 UTC
svn commit: r1131994 -
/incubator/mesos/trunk/frameworks/hadoop-0.20.2/hadoop-mesos.patch
Author: benh
Date: Sun Jun 5 08:21:10 2011
New Revision: 1131994
URL: http://svn.apache.org/viewvc?rev=1131994&view=rev
Log:
Updated hadoop-mesos.patch with latest changes to Hadoop port
Modified:
incubator/mesos/trunk/frameworks/hadoop-0.20.2/hadoop-mesos.patch
Modified: incubator/mesos/trunk/frameworks/hadoop-0.20.2/hadoop-mesos.patch
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/frameworks/hadoop-0.20.2/hadoop-mesos.patch?rev=1131994&r1=1131993&r2=1131994&view=diff
==============================================================================
--- incubator/mesos/trunk/frameworks/hadoop-0.20.2/hadoop-mesos.patch (original)
+++ incubator/mesos/trunk/frameworks/hadoop-0.20.2/hadoop-mesos.patch Sun Jun 5 08:21:10 2011
@@ -603,7 +603,7 @@ Index: src/contrib/mesos/src/java/org/ap
===================================================================
--- src/contrib/mesos/src/java/org/apache/hadoop/mapred/FrameworkScheduler.java (revision 0)
+++ src/contrib/mesos/src/java/org/apache/hadoop/mapred/FrameworkScheduler.java (revision 0)
-@@ -0,0 +1,776 @@
+@@ -0,0 +1,773 @@
+package org.apache.hadoop.mapred;
+
+import java.io.File;
@@ -630,10 +630,7 @@ Index: src/contrib/mesos/src/java/org/ap
+import mesos.Scheduler;
+import mesos.SchedulerDriver;
+import mesos.SlaveOffer;
-+import mesos.SlaveOfferVector;
-+import mesos.StringMap;
+import mesos.TaskDescription;
-+import mesos.TaskDescriptionVector;
+import mesos.TaskState;
+
+public class FrameworkScheduler extends Scheduler {
@@ -763,11 +760,11 @@ Index: src/contrib/mesos/src/java/org/ap
+
+ @Override
+ public void resourceOffer(SchedulerDriver d, String oid,
-+ SlaveOfferVector offers) {
++ List<SlaveOffer> offers) {
+ try {
+ synchronized(jobTracker) {
+ LOG.info("Got resource offer " + oid);
-+ TaskDescriptionVector tasks = new TaskDescriptionVector();
++ List<TaskDescription> tasks = new ArrayList<TaskDescription>();
+
+ int numOffers = (int) offers.size();
+ int[] cpus = new int[numOffers];
@@ -808,8 +805,8 @@ Index: src/contrib/mesos/src/java/org/ap
+ }
+ }
+
-+ StringMap params = new StringMap();
-+ params.set("timeout", "1");
++ Map<String, String> params = new HashMap<String, String>();
++ params.put("timeout", "1");
+ d.replyToOffer(oid, tasks, params);
+ }
+ } catch(Exception e) {
@@ -873,9 +870,9 @@ Index: src/contrib/mesos/src/java/org/ap
+
+ // Create a task description to pass back to Mesos
+ String name = "task " + mesosId + " (" + taskType + ")";
-+ StringMap params = new StringMap();
-+ params.set("cpus", "" + cpusPerTask);
-+ params.set("mem", "" + memPerTask);
++ Map<String, String> params = new HashMap<String, String>();
++ params.put("cpus", "" + cpusPerTask);
++ params.put("mem", "" + memPerTask);
+ return new TaskDescription(mesosId, slaveId, name, params, new byte[0]);
+ }
+