You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by hi...@apache.org on 2013/12/07 01:07:43 UTC
git commit: TEZ-644. Failing unit test TestTaskScheduler. (hitesh)
Updated Branches:
refs/heads/master 2600a28cd -> a474e5e64
TEZ-644. Failing unit test TestTaskScheduler. (hitesh)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/a474e5e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/a474e5e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/a474e5e6
Branch: refs/heads/master
Commit: a474e5e64055cb0c7ca287bebfb779925ee1538b
Parents: 2600a28
Author: Hitesh Shah <hi...@apache.org>
Authored: Fri Dec 6 16:07:24 2013 -0800
Committer: Hitesh Shah <hi...@apache.org>
Committed: Fri Dec 6 16:07:24 2013 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/tez/dag/app/rm/TaskScheduler.java | 6 +++++-
.../test/java/org/apache/tez/dag/app/rm/TestTaskScheduler.java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/a474e5e6/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskScheduler.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskScheduler.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskScheduler.java
index ab038fd..fd62a75 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskScheduler.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskScheduler.java
@@ -1094,9 +1094,13 @@ public class TaskScheduler extends AbstractService
throw new TezUncheckedException("New container " + container.getId()
+ " is already held.");
}
+ long nextScheduleTime = delayedContainerManager.maxScheduleTimeSeen;
+ if (delayedContainerManager.maxScheduleTimeSeen == -1) {
+ nextScheduleTime = System.currentTimeMillis();
+ }
Resources.addTo(allocatedResources, container.getResource());
delayedContainerManager.addDelayedContainer(container,
- delayedContainerManager.maxScheduleTimeSeen + 1);
+ nextScheduleTime + 1);
}
}
delayedContainerManager.triggerScheduling(false);
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/a474e5e6/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestTaskScheduler.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestTaskScheduler.java b/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestTaskScheduler.java
index 0e4285c..cc7bbae 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestTaskScheduler.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestTaskScheduler.java
@@ -380,7 +380,7 @@ public class TestTaskScheduler {
}
@SuppressWarnings({ "unchecked", "rawtypes" })
- @Test
+ @Test(timeout=10000)
public void testTaskSchedulerWithReuse() throws Exception {
RackResolver.init(new YarnConfiguration());
TaskSchedulerAppCallback mockApp = mock(TaskSchedulerAppCallback.class);