Repository: hadoop Updated Branches: refs/heads/branch-2 45c1f8ac8 -> 2299c8dff
YARN-6798. Fix NM startup failure with old state store due to version mismatch. (Botong Huang via rchiang) (cherry picked from commit f5f14a2ad67f91064a73685b44369c6314f0e1cd) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2299c8df Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2299c8df Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2299c8df Branch: refs/heads/branch-2 Commit: 2299c8dffa9e4b2391b09c79b9cccccc53f8c076 Parents: 45c1f8a Author: Ray Chiang <[email protected]> Authored: Tue Jul 18 12:35:08 2017 -0700 Committer: Subru Krishnan <[email protected]> Committed: Tue Aug 22 15:24:02 2017 -0700 ---------------------------------------------------------------------- .../recovery/NMLeveldbStateStoreService.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2299c8df/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMLeveldbStateStoreService.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMLeveldbStateStoreService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMLeveldbStateStoreService.java index f1e47c7..c556b39 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMLeveldbStateStoreService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMLeveldbStateStoreService.java @@ -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)); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
