Author: todd
Date: Mon Jan 14 21:34:22 2013
New Revision: 1433144
URL: http://svn.apache.org/viewvc?rev=1433144&view=rev
Log:
HDFS-4400. DFSInputStream#getBlockReader: last retries should ignore the cache.
Contributed by Colin Patrick McCabe.
Modified:
hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-347.txt
hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
Modified:
hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-347.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-347.txt?rev=1433144&r1=1433143&r2=1433144&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-347.txt
(original)
+++
hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-347.txt
Mon Jan 14 21:34:22 2013
@@ -17,3 +17,5 @@ HDFS-4388. DomainSocket should throw Asy
HDFS-4390. Bypass UNIX domain socket unit tests when they cannot be run.
(Colin Patrick McCabe via todd)
+HDFS-4400. DFSInputStream#getBlockReader: last retries should ignore the cache
+(Colin Patrick McCabe via todd)
Modified:
hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java?rev=1433144&r1=1433143&r2=1433144&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
(original)
+++
hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
Mon Jan 14 21:34:22 2013
@@ -941,7 +941,7 @@ public class DFSInputStream extends FSIn
// equivalent to declaring the DataNode bad.
boolean triedNonDomainSocketReader = false;
for (int retries = 0;
- retries < nCachedConnRetry && (!triedNonDomainSocketReader);
+ retries < nCachedConnRetry || (!triedNonDomainSocketReader);
++retries) {
Peer peer = null;
if (retries < nCachedConnRetry) {
