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 zh...@apache.org on 2017/07/26 14:45:48 UTC
hadoop git commit: HADOOP-14214. DomainSocketWatcher::add()/delete()
should not self interrupt while looping await(). Contributed by Mingliang Liu
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 964e192d1 -> e53c48994
HADOOP-14214. DomainSocketWatcher::add()/delete() should not self interrupt while looping await(). Contributed by Mingliang Liu
(cherry picked from commit d35e79abc2fee7153a6168e6088f100de59d8c81)
(cherry picked from commit 47d3c29e300e0d43ce4a26807432c9c0361e172e)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e53c4899
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e53c4899
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e53c4899
Branch: refs/heads/branch-2.7
Commit: e53c489941520e2fc52600f3b916d662d0ebe1a8
Parents: 964e192
Author: Mingliang Liu <li...@apache.org>
Authored: Thu Mar 23 11:33:06 2017 -0700
Committer: Zhe Zhang <zh...@apache.org>
Committed: Wed Jul 26 07:45:30 2017 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../org/apache/hadoop/net/unix/DomainSocketWatcher.java | 12 ++----------
2 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e53c4899/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 34e1829..981d936 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -188,6 +188,9 @@ Release 2.7.4 - UNRELEASED
HADOOP-10829. Iteration on CredentialProviderFactory.serviceLoader is
thread-unsafe. (enoy Antony via jnp)
+ HADOOP-14214. DomainSocketWatcher::add()/delete() should not self
+ interrupt while looping await(). (Mingliang Liu)
+
Release 2.7.3 - 2016-08-25
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e53c4899/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/unix/DomainSocketWatcher.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/unix/DomainSocketWatcher.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/unix/DomainSocketWatcher.java
index 5648ae1..2e0d1f5 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/unix/DomainSocketWatcher.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/unix/DomainSocketWatcher.java
@@ -321,11 +321,7 @@ public final class DomainSocketWatcher implements Closeable {
toAdd.add(entry);
kick();
while (true) {
- try {
- processedCond.await();
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- }
+ processedCond.awaitUninterruptibly();
if (!toAdd.contains(entry)) {
break;
}
@@ -347,11 +343,7 @@ public final class DomainSocketWatcher implements Closeable {
toRemove.put(sock.fd, sock);
kick();
while (true) {
- try {
- processedCond.await();
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- }
+ processedCond.awaitUninterruptibly();
if (!toRemove.containsKey(sock.fd)) {
break;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org