Author: szetszwo
Date: Fri Oct 23 00:28:41 2009
New Revision: 828901
URL: http://svn.apache.org/viewvc?rev=828901&view=rev
Log:
HDFS-127. Reset failure count in DFSClient for each block acquiring operation.
Contributed by Igor Bolotin
Modified:
hadoop/hdfs/branches/branch-0.21/CHANGES.txt
hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/DFSClient.java
Modified: hadoop/hdfs/branches/branch-0.21/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/CHANGES.txt?rev=828901&r1=828900&r2=828901&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.21/CHANGES.txt Fri Oct 23 00:28:41 2009
@@ -413,6 +413,11 @@
Release 0.20.2 - Unreleased
+ IMPROVEMENTS
+
+ HDFS-127. Reset failure count in DFSClient for each block acquiring
+ operation. (Igor Bolotin via szetszwo)
+
BUG FIXES
HDFS-686. NullPointerException is thrown while merging edit log and image.
Modified:
hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/DFSClient.java
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/DFSClient.java?rev=828901&r1=828900&r2=828901&view=diff
==============================================================================
---
hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/DFSClient.java
(original)
+++
hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/DFSClient.java
Fri Oct 23 00:28:41 2009
@@ -1879,6 +1879,8 @@
//
DatanodeInfo chosenNode = null;
int refetchToken = 1; // only need to get a new access token once
+ failures = 0;
+
while (true) {
//
// Compute desired block
@@ -2108,6 +2110,7 @@
//
Socket dn = null;
int refetchToken = 1; // only need to get a new access token once
+ failures = 0;
while (true) {
// cached block locations may have been updated by chooseDataNode()