HADOOP-14214. DomainSocketWatcher::add()/delete() should not self interrupt while looping await(). Contributed by Mingliang Liu
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d35e79ab Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d35e79ab Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d35e79ab Branch: refs/heads/HDFS-10467 Commit: d35e79abc2fee7153a6168e6088f100de59d8c81 Parents: c551955 Author: Mingliang Liu <lium...@apache.org> Authored: Thu Mar 23 11:33:06 2017 -0700 Committer: Mingliang Liu <lium...@apache.org> Committed: Thu Mar 23 13:34:03 2017 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/net/unix/DomainSocketWatcher.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d35e79ab/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 ad2fbfb..e1bcf7e 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-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
