big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-7517. Remove redundant non-null checks in FSNamesystem#getBlockLocations. Contributed by Haohui Mai.

Browse Source
This commit is contained in:
Haohui Mai 2014-12-12 11:51:17 -08:00
parent 3681de2039
commit 46612c7a51
2 changed files with 3 additions and 4 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

@ -579,6 +579,9 @@ Release 2.7.0 - UNRELEASED
HDFS-7497. Inconsistent report of decommissioning DataNodes between HDFS-7497. Inconsistent report of decommissioning DataNodes between
dfsadmin and NameNode webui. (Yongjun Zhang via wang) dfsadmin and NameNode webui. (Yongjun Zhang via wang)
HDFS-7517. Remove redundant non-null checks in FSNamesystem#
getBlockLocations. (wheat9)
Release 2.6.1 - UNRELEASED Release 2.6.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
View File

@ -1782,10 +1782,6 @@ LocatedBlocks getBlockLocations(String clientMachine, String src,
logAuditEvent(true, "open", src); logAuditEvent(true, "open", src);
if (res == null) {
return null;
}
if (res.updateAccessTime()) { if (res.updateAccessTime()) {
writeLock(); writeLock();
final long now = now(); final long now = now();