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 cm...@apache.org on 2014/12/16 20:07:52 UTC
hadoop git commit: HDFS-7494. Checking of closed in
DFSInputStream#pread() should be protected by synchronization (Ted Yu via
Colin P. McCabe)
Repository: hadoop
Updated Branches:
refs/heads/trunk c65f1b382 -> a97a1e731
HDFS-7494. Checking of closed in DFSInputStream#pread() should be protected by synchronization (Ted Yu via Colin P. McCabe)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a97a1e73
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a97a1e73
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a97a1e73
Branch: refs/heads/trunk
Commit: a97a1e73177974cff8afafad6ca43a96563f3c61
Parents: c65f1b3
Author: Colin Patrick Mccabe <cm...@cloudera.com>
Authored: Tue Dec 16 11:07:27 2014 -0800
Committer: Colin Patrick Mccabe <cm...@cloudera.com>
Committed: Tue Dec 16 11:07:27 2014 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../java/org/apache/hadoop/hdfs/DFSInputStream.java | 15 ++++++++-------
2 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a97a1e73/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 13f212a..ed163ef 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -598,6 +598,9 @@ Release 2.7.0 - UNRELEASED
HDFS-6425. Large postponedMisreplicatedBlocks has impact on blockReport
latency. (Ming Ma via kihwal)
+ HDFS-7494. Checking of closed in DFSInputStream#pread() should be protected
+ by synchronization (Ted Yu via Colin P. McCabe)
+
Release 2.6.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a97a1e73/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
index b8b1d90..ed46b16 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
@@ -41,6 +41,7 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorCompletionService;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.commons.io.IOUtils;
import org.apache.hadoop.classification.InterfaceAudience;
@@ -90,7 +91,7 @@ implements ByteBufferReadable, CanSetDropBehind, CanSetReadahead,
public static boolean tcpReadsDisabledForTesting = false;
private long hedgedReadOpsLoopNumForTesting = 0;
private final DFSClient dfsClient;
- private boolean closed = false;
+ private AtomicBoolean closed = new AtomicBoolean(false);
private final String src;
private final boolean verifyChecksum;
@@ -661,7 +662,8 @@ implements ByteBufferReadable, CanSetDropBehind, CanSetReadahead,
*/
@Override
public synchronized void close() throws IOException {
- if (closed) {
+ if (!closed.compareAndSet(false, true)) {
+ DFSClient.LOG.warn("DFSInputStream has been closed already");
return;
}
dfsClient.checkOpen();
@@ -685,7 +687,6 @@ implements ByteBufferReadable, CanSetDropBehind, CanSetReadahead,
blockReader = null;
}
super.close();
- closed = true;
}
@Override
@@ -822,7 +823,7 @@ implements ByteBufferReadable, CanSetDropBehind, CanSetReadahead,
private synchronized int readWithStrategy(ReaderStrategy strategy, int off, int len) throws IOException {
dfsClient.checkOpen();
- if (closed) {
+ if (closed.get()) {
throw new IOException("Stream closed");
}
Map<ExtendedBlock,Set<DatanodeInfo>> corruptedBlockMap
@@ -1375,7 +1376,7 @@ implements ByteBufferReadable, CanSetDropBehind, CanSetReadahead,
throws IOException {
// sanity checks
dfsClient.checkOpen();
- if (closed) {
+ if (closed.get()) {
throw new IOException("Stream closed");
}
failures = 0;
@@ -1484,7 +1485,7 @@ implements ByteBufferReadable, CanSetDropBehind, CanSetReadahead,
if (targetPos < 0) {
throw new EOFException("Cannot seek to negative offset");
}
- if (closed) {
+ if (closed.get()) {
throw new IOException("Stream is closed!");
}
boolean done = false;
@@ -1571,7 +1572,7 @@ implements ByteBufferReadable, CanSetDropBehind, CanSetReadahead,
*/
@Override
public synchronized int available() throws IOException {
- if (closed) {
+ if (closed.get()) {
throw new IOException("Stream closed");
}