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

HDFS-4544. Merge 1453436 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1453444 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2013-03-06 17:31:35 +00:00
parent 851a425b2a
commit c21caa021d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +51,9 @@ Release 2.0.4-beta - UNRELEASED
HDFS-4540. Namenode http server should use the web authentication HDFS-4540. Namenode http server should use the web authentication
keytab for spnego principal. (Arpit Gupta via suresh) keytab for spnego principal. (Arpit Gupta via suresh)
HDFS-4544. Error in deleting blocks should not do check disk, for
all types of errors. (Arpit Agarwal via suresh)
Release 2.0.3-alpha - 2013-02-06 Release 2.0.3-alpha - 2013-02-06
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPOfferService.java
View File

@ -539,7 +539,7 @@ class BPOfferService {
// using global fsdataset // using global fsdataset
dn.getFSDataset().invalidate(bcmd.getBlockPoolId(), toDelete); dn.getFSDataset().invalidate(bcmd.getBlockPoolId(), toDelete);
} catch(IOException e) { } catch(IOException e) {
dn.checkDiskError(); // Exceptions caught here are not expected to be disk-related.
throw e; throw e;
} }
dn.metrics.incrBlocksRemoved(toDelete.length); dn.metrics.incrBlocksRemoved(toDelete.length);