From 5c63482aaae57d0dc8a22fd550412151e1d82d90 Mon Sep 17 00:00:00 2001 From: Jian He Date: Wed, 27 Aug 2014 10:02:45 -0700 Subject: [PATCH] YARN-2182. Updated ContainerId#toString() to append RM Epoch number. Contributed by Tsuyoshi OZAWA (cherry-picked from commit e2d0ff364a84a4de10e7b11fe83cd3dab155a571) --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../apache/hadoop/yarn/api/records/ContainerId.java | 10 +++++++--- .../org/apache/hadoop/yarn/api/TestContainerId.java | 4 +++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index fe42b455eb5..64b55d3842a 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -137,6 +137,9 @@ Release 2.6.0 - UNRELEASED YARN-1326. RM should log using RMStore at startup time. (Tsuyoshi Ozawa via kasha) + YARN-2182. Updated ContainerId#toString() to append RM Epoch number. + (Tsuyoshi OZAWA via jianhe) + OPTIMIZATIONS BUG FIXES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ContainerId.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ContainerId.java index 73e80859049..fc7f40488ec 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ContainerId.java +++ b/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 a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestContainerId.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestContainerId.java index f92df8a8d0c..b23d0ed3fbc 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestContainerId.java +++ b/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()); }