You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by jl...@apache.org on 2016/02/10 22:19:07 UTC
hadoop git commit: MAPREDUCE-6460.
TestRMContainerAllocator.testAttemptNotFoundCausesRMCommunicatorException
fails. Contributed by Zhihai Xu. (cherry picked from commit
e3ace31e2b7e3a8dc6cf3dc044d5ef2a9aa12e29)
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 9d574368b -> 717b1a1f9
MAPREDUCE-6460. TestRMContainerAllocator.testAttemptNotFoundCausesRMCommunicatorException fails. Contributed by Zhihai Xu.
(cherry picked from commit e3ace31e2b7e3a8dc6cf3dc044d5ef2a9aa12e29)
Conflicts:
hadoop-mapreduce-project/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/717b1a1f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/717b1a1f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/717b1a1f
Branch: refs/heads/branch-2.7
Commit: 717b1a1f99769bc100958563080799308dac5f80
Parents: 9d57436
Author: Jason Lowe <jl...@apache.org>
Authored: Wed Feb 10 16:58:57 2016 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Wed Feb 10 16:58:57 2016 +0000
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 3 +++
.../hadoop/mapreduce/v2/app/rm/TestRMContainerAllocator.java | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/717b1a1f/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 0752de0..1657a27 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -46,6 +46,9 @@ Release 2.7.3 - UNRELEASED
MAPREDUCE-6191. Improve clearing stale state of Java serialization
testcase. (Sam Liu via Eric Yang)
+ MAPREDUCE-6460. TestRMContainerAllocator.
+ testAttemptNotFoundCausesRMCommunicatorException fails. (Zhihai Xu)
+
Release 2.7.2 - 2016-01-25
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/717b1a1f/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMContainerAllocator.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMContainerAllocator.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMContainerAllocator.java
index eb40069..dc556da 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMContainerAllocator.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMContainerAllocator.java
@@ -123,6 +123,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
import org.apache.hadoop.yarn.server.resourcemanager.recovery.MemoryRMStateStore;
import org.apache.hadoop.yarn.server.resourcemanager.recovery.RMStateStore;
import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
+import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppState;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.Allocation;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEvent;
@@ -2607,7 +2608,7 @@ public class TestRMContainerAllocator {
// Now kill the application
rm.killApp(app.getApplicationId());
-
+ rm.waitForState(app.getApplicationId(), RMAppState.KILLED);
allocator.schedule();
}