Repository: hadoop Updated Branches: refs/heads/branch-2 865931506 -> 9c00ae000
YARN-3919. NPEs' while stopping service after exception during CommonNodeLabelsManager#start. (varun saxena via rohithsharmaks) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9c00ae00 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9c00ae00 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9c00ae00 Branch: refs/heads/branch-2 Commit: 9c00ae00091dcd9a2478cb2e1f440f963ff33d1f Parents: 8659315 Author: rohithsharmaks <[email protected]> Authored: Wed Jul 29 23:44:15 2015 +0530 Committer: rohithsharmaks <[email protected]> Committed: Wed Jul 29 23:44:15 2015 +0530 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/yarn/event/AsyncDispatcher.java | 3 ++- .../hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java | 8 ++------ 3 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9c00ae00/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 5c356b6..ff36abc 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -655,6 +655,9 @@ Release 2.8.0 - UNRELEASED YARN-3982. container-executor parsing of container-executor.cfg broken in trunk and branch-2. (Varun Vasudev via xgong) + YARN-3919. NPEs' while stopping service after exception during + CommonNodeLabelsManager#start. (varun saxane via rohithsharmaks) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/9c00ae00/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java index 48312a3..f670112 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java @@ -139,7 +139,8 @@ public class AsyncDispatcher extends AbstractService implements Dispatcher { blockNewEvents = true; LOG.info("AsyncDispatcher is draining to stop, igonring any new events."); synchronized (waitForDrained) { - while (!drained && eventHandlingThread.isAlive()) { + while (!drained && eventHandlingThread != null + && eventHandlingThread.isAlive()) { waitForDrained.wait(1000); LOG.info("Waiting for AsyncDispatcher to drain. Thread state is :" + eventHandlingThread.getState()); http://git-wip-us.apache.org/repos/asf/hadoop/blob/9c00ae00/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java index abf07e8..20dc67c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java @@ -33,6 +33,7 @@ import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.LocalFileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.io.IOUtils; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.api.records.NodeLabel; @@ -92,12 +93,7 @@ public class FileSystemNodeLabelsStore extends NodeLabelsStore { @Override public void close() throws IOException { - try { - fs.close(); - editlogOs.close(); - } catch (IOException e) { - LOG.warn("Exception happened whiling shutting down,", e); - } + IOUtils.cleanup(LOG, fs, editlogOs); } private void setFileSystem(Configuration conf) throws IOException {
