Skip to content

Commit 47d3c29

Browse files
committed
HADOOP-14214. DomainSocketWatcher::add()/delete() should not self interrupt while looping await(). Contributed by Mingliang Liu
(cherry picked from commit d35e79a)
1 parent 5e794c7 commit 47d3c29

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/unix/DomainSocketWatcher.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -321,11 +321,7 @@ public void add(DomainSocket sock, Handler handler) {
321321
toAdd.add(entry);
322322
kick();
323323
while (true) {
324-
try {
325-
processedCond.await();
326-
} catch (InterruptedException e) {
327-
Thread.currentThread().interrupt();
328-
}
324+
processedCond.awaitUninterruptibly();
329325
if (!toAdd.contains(entry)) {
330326
break;
331327
}
@@ -347,11 +343,7 @@ public void remove(DomainSocket sock) {
347343
toRemove.put(sock.fd, sock);
348344
kick();
349345
while (true) {
350-
try {
351-
processedCond.await();
352-
} catch (InterruptedException e) {
353-
Thread.currentThread().interrupt();
354-
}
346+
processedCond.awaitUninterruptibly();
355347
if (!toRemove.containsKey(sock.fd)) {
356348
break;
357349
}

0 commit comments

Comments
 (0)