Repository: hadoop Updated Branches: refs/heads/trunk 4009fa3a9 -> c35a5a7a8
YARN-5023. TestAMRestart#testShouldNotCountFailureToMaxAttemptRetry fails. Contributed by sandflee Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c35a5a7a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c35a5a7a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c35a5a7a Branch: refs/heads/trunk Commit: c35a5a7a8d85b42498e6981a6b1f09f2bdd56459 Parents: 4009fa3 Author: Jian He <[email protected]> Authored: Fri Jul 1 14:28:43 2016 -0700 Committer: Jian He <[email protected]> Committed: Fri Jul 1 14:29:03 2016 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/yarn/server/resourcemanager/MockRM.java | 4 ++++ .../org/apache/hadoop/yarn/server/resourcemanager/TestRM.java | 2 -- .../resourcemanager/applicationsmanager/TestAMRestart.java | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c35a5a7a/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 f7a210c..955fed9 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 @@ -937,6 +937,10 @@ public class MockRM extends ResourceManager { rm.getResourceScheduler()).getApplicationAttempt(attemptId)); } + /** + * NOTE: nm.nodeHeartbeat is explicitly invoked, + * don't invoke it before calling launchAM + */ public static MockAM launchAM(RMApp app, MockRM rm, MockNM nm) throws Exception { RMAppAttempt attempt = waitForAttemptScheduled(app, rm); http://git-wip-us.apache.org/repos/asf/hadoop/blob/c35a5a7a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRM.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/TestRM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRM.java index 69c62e7..ee6d51a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRM.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRM.java @@ -208,8 +208,6 @@ public class TestRM extends ParameterizedSchedulerTestBase { CapacityScheduler cs = (CapacityScheduler) rm.getResourceScheduler(); cs.getApplicationAttempt(attempt.getAppAttemptId()).getNewContainerId(); - // kick the scheduling - nm1.nodeHeartbeat(true); MockAM am = MockRM.launchAM(app, rm, nm1); // am container Id not equal to 1. Assert.assertTrue( http://git-wip-us.apache.org/repos/asf/hadoop/blob/c35a5a7a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRestart.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/applicationsmanager/TestAMRestart.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRestart.java index 76a17c3..bc09b37 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRestart.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRestart.java @@ -473,7 +473,6 @@ public class TestAMRestart { appState.getAttempt(am4.getApplicationAttemptId()) .getAMContainerExitStatus()); // launch next AM in nm2 - nm2.nodeHeartbeat(true); MockAM am5 = rm1.waitForNewAMToLaunchAndRegister(app1.getApplicationId(), 5, nm2); RMAppAttempt attempt5 = app1.getCurrentAppAttempt(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
