diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index a072165b6d4..ba5adeec87c 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -189,6 +189,9 @@ Release 2.5.0 - UNRELEASED MAPREDUCE-5837. MRAppMaster fails when checking on uber mode. (wheat9) + MAPREDUCE-5749. TestRMContainerAllocator#testReportedAppProgress Failed + (jlowe) + Release 2.4.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.java index 6394f022a49..9c041870758 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.java @@ -122,6 +122,9 @@ public class TestRMContainerAllocator { public void setup() { MyContainerAllocator.getJobUpdatedNodeEvents().clear(); MyContainerAllocator.getTaskAttemptKillEvents().clear(); + + // make each test create a fresh user to avoid leaking tokens between tests + UserGroupInformation.setLoginUser(null); } @After @@ -1519,17 +1522,15 @@ public class TestRMContainerAllocator { @Override protected void register() { ApplicationAttemptId attemptId = getContext().getApplicationAttemptId(); - UserGroupInformation ugi = - UserGroupInformation.createRemoteUser(attemptId.toString()); Token token = rm.getRMContext().getRMApps().get(attemptId.getApplicationId()) .getRMAppAttempt(attemptId).getAMRMToken(); try { + UserGroupInformation ugi = UserGroupInformation.getCurrentUser(); ugi.addTokenIdentifier(token.decodeIdentifier()); } catch (IOException e) { throw new YarnRuntimeException(e); } - UserGroupInformation.setLoginUser(ugi); super.register(); }