Author: acmurthy Date: Thu Sep 26 23:02:51 2013 New Revision: 1526735 URL: http://svn.apache.org/r1526735 Log: MAPREDUCE-5514. Fix TestRMContainerAllocator. Contributed by Zhijie Shen.
Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.java Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1526735&r1=1526734&r2=1526735&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Thu Sep 26 23:02:51 2013 @@ -181,6 +181,8 @@ Release 2.3.0 - UNRELEASED MAPREDUCE-5522. Incorrect oreder expected from JobQueueInfo (Jinghui Wang via bobby) + MAPREDUCE-5514. Fix TestRMContainerAllocator. (Zhijie Shen via acmurthy) + Release 2.2.0 - UNRELEASED INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.java?rev=1526735&r1=1526734&r2=1526735&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.java Thu Sep 26 23:02:51 2013 @@ -432,12 +432,22 @@ public class TestRMContainerAllocator { } private static class MyResourceManager extends MockRM { + + private static long fakeClusterTimeStamp = System.currentTimeMillis(); public MyResourceManager(Configuration conf) { super(conf); } @Override + public void serviceStart() throws Exception { + super.serviceStart(); + // Ensure that the application attempt IDs for all the tests are the same + // The application attempt IDs will be used as the login user names + MyResourceManager.setClusterTimeStamp(fakeClusterTimeStamp); + } + + @Override protected Dispatcher createDispatcher() { return new DrainDispatcher(); }