Repository: hadoop Updated Branches: refs/heads/branch-2.9 17596fba2 -> b21b8348b
YARN-8054. Improve robustness of the LocalDirsHandlerService MonitoringTimerTask thread. Contributed by Jonathan Eagles (cherry picked from commit 5aa7052e319c3273243dda9993fb6c2d776eb7cc) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b21b8348 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b21b8348 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b21b8348 Branch: refs/heads/branch-2.9 Commit: b21b8348b4bbdb958c5acdbd1a3245557271e7f2 Parents: 17596fb Author: Jason Lowe <jl...@apache.org> Authored: Wed Mar 21 17:19:20 2018 -0500 Committer: Jason Lowe <jl...@apache.org> Committed: Wed Mar 21 17:43:11 2018 -0500 ---------------------------------------------------------------------- .../yarn/server/nodemanager/LocalDirsHandlerService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b21b8348/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LocalDirsHandlerService.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/LocalDirsHandlerService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LocalDirsHandlerService.java index c0630b2..621cabc 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LocalDirsHandlerService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LocalDirsHandlerService.java @@ -166,7 +166,12 @@ public class LocalDirsHandlerService extends AbstractService { @Override public void run() { - checkDirs(); + try { + checkDirs(); + } catch (Throwable t) { + // Prevent uncaught exceptions from killing this thread + LOG.warn("Error while checking local directories: ", t); + } } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
