Repository: hadoop Updated Branches: refs/heads/branch-2 44e6ae8cc -> fb9327eda
YARN-4568. Fix message when NodeManager runs into errors initializing the recovery directory. (rchiang) (cherry picked from commit 0a5def155eff4564b5dc7685e7460952f51bbd24) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fb9327ed Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fb9327ed Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fb9327ed Branch: refs/heads/branch-2 Commit: fb9327edae0c169ff74ac4f9b740776b855e921d Parents: 44e6ae8 Author: Ray Chiang <[email protected]> Authored: Fri Jul 1 15:49:30 2016 -0700 Committer: Ray Chiang <[email protected]> Committed: Fri Jul 1 15:55:56 2016 -0700 ---------------------------------------------------------------------- .../apache/hadoop/yarn/server/nodemanager/NodeManager.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/fb9327ed/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.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/NodeManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java index 6ca7ffe..f7d226e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java @@ -287,7 +287,14 @@ public class NodeManager extends CompositeService .RM_WORK_PRESERVING_RECOVERY_ENABLED, YarnConfiguration.DEFAULT_RM_WORK_PRESERVING_RECOVERY_ENABLED); - initAndStartRecoveryStore(conf); + try { + initAndStartRecoveryStore(conf); + } catch (IOException e) { + String recoveryDirName = conf.get(YarnConfiguration.NM_RECOVERY_DIR); + throw new + YarnRuntimeException("Unable to initialize recovery directory at " + + recoveryDirName, e); + } NMContainerTokenSecretManager containerTokenSecretManager = new NMContainerTokenSecretManager(conf, nmStore); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
