Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-10404. Some accesses to DomainSocketWatcher#closed are not protected by the lock (cmccabe) 

(cherry picked from commit 8099de259f)
This commit is contained in:
Colin Patrick Mccabe 2014-10-06 14:40:41 -07:00
parent e5e9cf219a
commit c97134d054
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -15,6 +15,9 @@ Release 2.7.0 - UNRELEASED
BUG FIXES BUG FIXES
HADOOP-10404. Some accesses to DomainSocketWatcher#closed are not protected
by the lock (cmccabe)
Release 2.6.0 - UNRELEASED Release 2.6.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

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

@ -101,6 +101,7 @@ public final class DomainSocketWatcher implements Closeable {
*/ */
private class NotificationHandler implements Handler { private class NotificationHandler implements Handler {
public boolean handle(DomainSocket sock) { public boolean handle(DomainSocket sock) {
lock.lock();
try { try {
if (LOG.isTraceEnabled()) { if (LOG.isTraceEnabled()) {
LOG.trace(this + ": NotificationHandler: doing a read on " + LOG.trace(this + ": NotificationHandler: doing a read on " +
@ -124,6 +125,8 @@ public final class DomainSocketWatcher implements Closeable {
} }
closed = true; closed = true;
return true; return true;
} finally {
lock.unlock();
} }
} }
} }
@ -346,12 +349,15 @@ public final class DomainSocketWatcher implements Closeable {
* Wake up the DomainSocketWatcher thread. * Wake up the DomainSocketWatcher thread.
*/ */
private void kick() { private void kick() {
lock.lock();
try { try {
notificationSockets[0].getOutputStream().write(0); notificationSockets[0].getOutputStream().write(0);
} catch (IOException e) { } catch (IOException e) {
if (!closed) { if (!closed) {
LOG.error(this + ": error writing to notificationSockets[0]", e); LOG.error(this + ": error writing to notificationSockets[0]", e);
} }
} finally {
lock.unlock();
} }
} }