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 2013/08/03 00:21:20 UTC
[3/5] git commit: Get Hadoop code to compile!
Get Hadoop code to compile!
Review: https://reviews.apache.org/r/13226
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/dba8c38d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/dba8c38d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/dba8c38d
Branch: refs/heads/master
Commit: dba8c38df8694ed2a93af2445b28238b05e69315
Parents: 25cb6f9
Author: Benjamin Hindman <be...@gmail.com>
Authored: Thu Aug 1 22:02:06 2013 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Fri Aug 2 14:25:32 2013 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/mapred/MesosScheduler.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/dba8c38d/hadoop/src/main/java/org/apache/hadoop/mapred/MesosScheduler.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/hadoop/mapred/MesosScheduler.java b/hadoop/src/main/java/org/apache/hadoop/mapred/MesosScheduler.java
index 7a1469d..0332dea 100644
--- a/hadoop/src/main/java/org/apache/hadoop/mapred/MesosScheduler.java
+++ b/hadoop/src/main/java/org/apache/hadoop/mapred/MesosScheduler.java
@@ -148,7 +148,7 @@ public class MesosScheduler extends TaskScheduler implements Scheduler {
+ mesosTracker.host);
driver.killTask(mesosTracker.taskId);
- tracker.timer.cancel();
+ mesosTracker.timer.cancel();
mesosTrackers.remove(tracker);
}
}
@@ -756,7 +756,7 @@ public class MesosScheduler extends TaskScheduler implements Scheduler {
for (HttpHost tracker : trackers) {
if (mesosTrackers.get(tracker).taskId.equals(taskStatus.getTaskId())) {
LOG.info("Removing terminated TaskTracker: " + tracker);
- tracker.timer.cancel();
+ mesosTrackers.get(tracker).timer.cancel();
mesosTrackers.remove(tracker);
}
}