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

HDFS-8969. Clean up findbugs warnings for HDFS-8823 and HDFS-8932. Contributed by Anu Engineer.

This commit is contained in:
Haohui Mai 2015-08-27 13:03:16 -07:00
parent 7a668981f5
commit 1b01d163a2
3 changed files with 5 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

@ -896,6 +896,9 @@ Release 2.8.0 - UNRELEASED
HDFS-8961. Investigate lock issue in o.a.h.hdfs.shortcircuit. HDFS-8961. Investigate lock issue in o.a.h.hdfs.shortcircuit.
DfsClientShmManager.EndpointShmManager. (Mingliang Liu via wheat9) DfsClientShmManager.EndpointShmManager. (Mingliang Liu via wheat9)
HDFS-8969. Clean up findbugs warnings for HDFS-8823 and HDFS-8932.
(Anu Engineer via wheat9)
Release 2.7.2 - UNRELEASED Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
View File

@ -1651,7 +1651,7 @@ public class FSEditLog implements LogsPurgeable {
* Return total number of syncs happened on this edit log. * Return total number of syncs happened on this edit log.
* @return long - count * @return long - count
*/ */
public long getTotalSyncCount() { public synchronized long getTotalSyncCount() {
if (editLogStream != null) { if (editLogStream != null) {
return editLogStream.getNumSync(); return editLogStream.getNumSync();
} else { } else {

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java
View File

@ -252,9 +252,7 @@ public class NamenodeFsck implements DataEncryptionKeyFactory {
NumberReplicas numberReplicas= bm.countNodes(blockInfo); NumberReplicas numberReplicas= bm.countNodes(blockInfo);
out.println("Block Id: " + blockId); out.println("Block Id: " + blockId);
out.println("Block belongs to: "+iNode.getFullPathName()); out.println("Block belongs to: "+iNode.getFullPathName());
if (blockInfo != null) {
out.println("No. of Expected Replica: " + blockInfo.getReplication()); out.println("No. of Expected Replica: " + blockInfo.getReplication());
}
out.println("No. of live Replica: " + numberReplicas.liveReplicas()); out.println("No. of live Replica: " + numberReplicas.liveReplicas());
out.println("No. of excess Replica: " + numberReplicas.excessReplicas()); out.println("No. of excess Replica: " + numberReplicas.excessReplicas());
out.println("No. of stale Replica: " + out.println("No. of stale Replica: " +