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 rk...@apache.org on 2018/01/05 21:55:26 UTC
hadoop git commit: YARN-7645.
TestContainerResourceUsage#testUsageAfterAMRestartWithMultipleContainers is
flakey with FairScheduler (rkanter)
Repository: hadoop
Updated Branches:
refs/heads/trunk f8e7dd9b1 -> 2aa4f0a55
YARN-7645. TestContainerResourceUsage#testUsageAfterAMRestartWithMultipleContainers is flakey with FairScheduler (rkanter)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2aa4f0a5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2aa4f0a5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2aa4f0a5
Branch: refs/heads/trunk
Commit: 2aa4f0a55936239d35babd84da2a0d1a261bc9bd
Parents: f8e7dd9
Author: Robert Kanter <rk...@apache.org>
Authored: Fri Jan 5 13:55:09 2018 -0800
Committer: Robert Kanter <rk...@apache.org>
Committed: Fri Jan 5 13:55:09 2018 -0800
----------------------------------------------------------------------
.../java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2aa4f0a5/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java
index 19ca6d7..302f5b3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java
@@ -1199,6 +1199,7 @@ public class MockRM extends ResourceManager {
nm.nodeHeartbeat(true);
((AbstractYarnScheduler)rm.getResourceScheduler()).update();
rm.drainEventsImplicitly();
+ nm.nodeHeartbeat(true);
MockAM am = rm.sendAMLaunched(attempt.getAppAttemptId());
rm.waitForState(attempt.getAppAttemptId(), RMAppAttemptState.LAUNCHED);
return am;
@@ -1215,6 +1216,7 @@ public class MockRM extends ResourceManager {
nm.nodeHeartbeat(true);
((AbstractYarnScheduler)rm.getResourceScheduler()).update();
rm.drainEventsImplicitly();
+ nm.nodeHeartbeat(true);
MockAM am = new MockAM(rm.getRMContext(), rm.masterService,
attempt.getAppAttemptId());
rm.waitForState(attempt.getAppAttemptId(), RMAppAttemptState.LAUNCHED);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org