diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ContainerId.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ContainerId.java index 73e8085..fc7f404 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ContainerId.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ContainerId.java @@ -83,7 +83,7 @@ public static ContainerId newInstance(ApplicationAttemptId appAttemptId, // TODO: fail the app submission if attempts are more than 10 or something - private static final ThreadLocal appAttemptIdFormat = + private static final ThreadLocal appAttemptIdAndEpochFormat = new ThreadLocal() { @Override public NumberFormat initialValue() { @@ -153,9 +153,13 @@ public String toString() { sb.append(ApplicationId.appIdFormat.get().format(appId.getId())) .append("_"); sb.append( - appAttemptIdFormat.get().format( + appAttemptIdAndEpochFormat.get().format( getApplicationAttemptId().getAttemptId())).append("_"); - sb.append(containerIdFormat.get().format(getId())); + sb.append(containerIdFormat.get().format(0x3fffff & getId())); + int epoch = getId() >> 22; + if (epoch > 0) { + sb.append("_").append(appAttemptIdAndEpochFormat.get().format(epoch)); + } return sb.toString(); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestContainerId.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestContainerId.java index f92df8a..b23d0ed 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestContainerId.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestContainerId.java @@ -54,7 +54,9 @@ public void testContainerId() { long ts = System.currentTimeMillis(); ContainerId c6 = newContainerId(36473, 4365472, ts, 25645811); Assert.assertEquals("container_10_0001_01_000001", c1.toString()); - Assert.assertEquals("container_" + ts + "_36473_4365472_25645811", + Assert.assertEquals(479987, 0x003fffff & c6.getId()); + Assert.assertEquals(6, c6.getId() >> 22); + Assert.assertEquals("container_" + ts + "_36473_4365472_479987_06", c6.toString()); }