You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2016/02/25 01:50:25 UTC
[12/31] hadoop git commit: HADOOP-12829.
StatisticsDataReferenceCleaner swallows interrupt exceptions (Gregory Chanan
via cmccabe)
HADOOP-12829. StatisticsDataReferenceCleaner swallows interrupt exceptions (Gregory Chanan via cmccabe)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d9c409a4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d9c409a4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d9c409a4
Branch: refs/heads/HDFS-1312
Commit: d9c409a4286e36387fb39e7d622e850c13315465
Parents: 9ed17f1
Author: Colin Patrick Mccabe <cm...@cloudera.com>
Authored: Tue Feb 23 11:11:22 2016 -0800
Committer: Colin Patrick Mccabe <cm...@cloudera.com>
Committed: Tue Feb 23 11:11:22 2016 -0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/fs/FileSystem.java | 9 +++++----
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d9c409a4/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 361859a..d405af3 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -719,6 +719,9 @@ Release 2.9.0 - UNRELEASED
HADOOP-12714. Fix hadoop-mapreduce-client-nativetask unit test which fails
because it is not able to open the "glibc bug spill" file. (cmccabe)
+ HADOOP-12829. StatisticsDataReferenceCleaner swallows interrupt exceptions
+ (Gregory Chanan via cmccabe)
+
Release 2.8.0 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d9c409a4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
index 3e26f68..8c1d57b 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
@@ -3184,15 +3184,16 @@ public abstract class FileSystem extends Configured implements Closeable {
private static class StatisticsDataReferenceCleaner implements Runnable {
@Override
public void run() {
- while (true) {
+ while (!Thread.interrupted()) {
try {
StatisticsDataReference ref =
(StatisticsDataReference)STATS_DATA_REF_QUEUE.remove();
ref.cleanUp();
+ } catch (InterruptedException ie) {
+ LOG.warn("Cleaner thread interrupted, will stop", ie);
+ Thread.currentThread().interrupt();
} catch (Throwable th) {
- // the cleaner thread should continue to run even if there are
- // exceptions, including InterruptedException
- LOG.warn("exception in the cleaner thread but it will continue to "
+ LOG.warn("Exception in the cleaner thread but it will continue to "
+ "run", th);
}
}