Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-6798. Fix NM startup failure with old state store due to version mismatch. (Botong Huang via rchiang) 

(cherry picked from commit f5f14a2ad6)
This commit is contained in:
Ray Chiang 2017-07-18 12:35:08 -07:00 committed by Subru Krishnan
parent 45c1f8ac8e
commit 2299c8dffa
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMLeveldbStateStoreService.java
View File

@ -85,10 +85,11 @@ public class NMLeveldbStateStoreService extends NMStateStoreService {
private static final String DB_NAME = "yarn-nm-state";
private static final String DB_SCHEMA_VERSION_KEY = "nm-schema-version";
// Set to 1.1 by YARN-5049
// Set to 1.2 by YARN-6127
private static final Version CURRENT_VERSION_INFO = Version
.newInstance(1, 2);
/**
* Changes from 1.0 to 1.1: Save AMRMProxy state in NMSS.
* Changes from 1.2 to 1.2: Save queued container information.
*/
private static final Version CURRENT_VERSION_INFO = Version.newInstance(1, 2);
private static final String DELETION_TASK_KEY_PREFIX =
"DeletionService/deltask_";
@ -491,8 +492,8 @@ public class NMLeveldbStateStoreService extends NMStateStoreService {
batch.delete(bytes(keyPrefix + CONTAINER_QUEUED_KEY_SUFFIX));
batch.delete(bytes(keyPrefix + CONTAINER_KILLED_KEY_SUFFIX));
batch.delete(bytes(keyPrefix + CONTAINER_EXIT_CODE_KEY_SUFFIX));
List<String> unknownKeysForContainer =
containerUnknownKeySuffixes.removeAll(containerId);
List<String> unknownKeysForContainer = containerUnknownKeySuffixes
.removeAll(containerId);
for (String unknownKeySuffix : unknownKeysForContainer) {
batch.delete(bytes(keyPrefix + unknownKeySuffix));
}