diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationAttemptId.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationAttemptId.java index 3ce91a8..f9b4eb6 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationAttemptId.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationAttemptId.java @@ -41,7 +41,7 @@ @Private @Unstable - public static final String appAttemptIdStrPrefix = "appattempt_"; + public static final String APPLICATION_ATTEMPT_ID_PREFIX = "appattempt_"; @Private @Unstable @@ -130,7 +130,7 @@ public int compareTo(ApplicationAttemptId other) { @Override public String toString() { - StringBuilder sb = new StringBuilder(appAttemptIdStrPrefix); + StringBuilder sb = new StringBuilder(APPLICATION_ATTEMPT_ID_PREFIX); sb.append(this.getApplicationId().getClusterTimestamp()).append("_"); sb.append(ApplicationId.appIdFormat.get().format( this.getApplicationId().getId())); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationId.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationId.java index 47b53bd..ee905f4 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationId.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationId.java @@ -41,7 +41,7 @@ @Private @Unstable - public static final String appIdStrPrefix = "application_"; + public static final String APPLICATION_ID_PREFIX = "application_"; @Private @Unstable @@ -105,7 +105,7 @@ public int compareTo(ApplicationId other) { @Override public String toString() { - return appIdStrPrefix + this.getClusterTimestamp() + "_" + return APPLICATION_ID_PREFIX + this.getClusterTimestamp() + "_" + appIdFormat.get().format(getId()); } 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 ccbe6f1..abafb70 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 @@ -36,6 +36,10 @@ @Private @Unstable + public static final String CONTAINER_ID_PREFIX = "container_"; + + @Private + @Unstable public static ContainerId newInstance(ApplicationAttemptId appAttemptId, int containerId) { ContainerId id = Records.newRecord(ContainerId.class); @@ -137,7 +141,7 @@ public int compareTo(ContainerId other) { @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("container_"); + sb.append(CONTAINER_ID_PREFIX); ApplicationId appId = getApplicationAttemptId().getApplicationId(); sb.append(appId.getClusterTimestamp()).append("_"); sb.append(ApplicationId.appIdFormat.get().format(appId.getId())) diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java index e85ba92..8e0f6b8 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java @@ -124,7 +124,7 @@ private void loadRMAppState(RMState rmState) throws Exception { } byte[] childData = readFile(childNodeStatus.getPath(), childNodeStatus.getLen()); - if (childNodeName.startsWith(ApplicationId.appIdStrPrefix)) { + if (childNodeName.startsWith(ApplicationId.APPLICATION_ID_PREFIX)) { // application LOG.info("Loading application from node: " + childNodeName); ApplicationId appId = ConverterUtils.toApplicationId(childNodeName); @@ -139,7 +139,7 @@ private void loadRMAppState(RMState rmState) throws Exception { assert appId.equals(appState.context.getApplicationId()); rmState.appState.put(appId, appState); } else if (childNodeName - .startsWith(ApplicationAttemptId.appAttemptIdStrPrefix)) { + .startsWith(ApplicationAttemptId.APPLICATION_ATTEMPT_ID_PREFIX)) { // attempt LOG.info("Loading application attempt from node: " + childNodeName); ApplicationAttemptId attemptId = diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java index 41c95d3..4cbbb59 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java @@ -215,7 +215,7 @@ private synchronized void loadRMAppState(RMState rmState) throws Exception { for (String childNodeName : childNodes) { String childNodePath = getNodePath(rmAppRoot, childNodeName); byte[] childData = getDataWithRetries(childNodePath, true); - if (childNodeName.startsWith(ApplicationId.appIdStrPrefix)) { + if (childNodeName.startsWith(ApplicationId.APPLICATION_ID_PREFIX)) { // application LOG.info("Loading application from znode: " + childNodeName); ApplicationId appId = ConverterUtils.toApplicationId(childNodeName); @@ -232,7 +232,7 @@ private synchronized void loadRMAppState(RMState rmState) throws Exception { } rmState.appState.put(appId, appState); } else if (childNodeName - .startsWith(ApplicationAttemptId.appAttemptIdStrPrefix)) { + .startsWith(ApplicationAttemptId.APPLICATION_ATTEMPT_ID_PREFIX)) { // attempt LOG.info("Loading application attempt from znode: " + childNodeName); ApplicationAttemptId attemptId =