Repository: hadoop Updated Branches: refs/heads/branch-2 cf6fb0916 -> baa6ef020
HDFS-9174. Fix findbugs warnings in FSOutputSummer.tracer and DirectoryScanner$ReportCompiler.currentThread. Contributed by Yi Liu. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/baa6ef02 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/baa6ef02 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/baa6ef02 Branch: refs/heads/branch-2 Commit: baa6ef020797ab2b562d48ce08585c4844b4755c Parents: cf6fb09 Author: Haohui Mai <[email protected]> Authored: Tue Sep 29 14:56:06 2015 -0700 Committer: Haohui Mai <[email protected]> Committed: Tue Sep 29 14:56:13 2015 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/fs/FSOutputSummer.java | 3 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../apache/hadoop/hdfs/server/datanode/DirectoryScanner.java | 8 -------- 3 files changed, 3 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/baa6ef02/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSOutputSummer.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSOutputSummer.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSOutputSummer.java index aec635d..8ce06a9 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSOutputSummer.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSOutputSummer.java @@ -22,7 +22,6 @@ import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.util.DataChecksum; import org.apache.htrace.core.TraceScope; -import org.apache.htrace.core.Tracer; import java.io.IOException; import java.io.OutputStream; @@ -43,8 +42,6 @@ abstract public class FSOutputSummer extends OutputStream { private byte checksum[]; // The number of valid bytes in the buffer. private int count; - // The HTrace tracer to use - private Tracer tracer; // We want this value to be a multiple of 3 because the native code checksums // 3 chunks simultaneously. The chosen value of 9 strikes a balance between http://git-wip-us.apache.org/repos/asf/hadoop/blob/baa6ef02/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 36a93e0..a650e76 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1115,6 +1115,9 @@ Release 2.8.0 - UNRELEASED HDFS-9141. Thread leak in Datanode#refreshVolumes. (Uma Maheswara Rao G via yliu) + HDFS-9174. Fix findbugs warnings in FSOutputSummer.tracer and + DirectoryScanner$ReportCompiler.currentThread. (Yi Liu via wheat9) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/baa6ef02/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java index b8ea5bf..392c121 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java @@ -785,12 +785,6 @@ public class DirectoryScanner implements Runnable { private final StopWatch perfTimer = new StopWatch(); /** - * The associated thread. Used for testing purposes only. - */ - @VisibleForTesting - Thread currentThread; - - /** * Create a report compiler for the given volume on the given datanode. * * @param datanode the target datanode @@ -809,8 +803,6 @@ public class DirectoryScanner implements Runnable { */ @Override public ScanInfoPerBlockPool call() throws IOException { - currentThread = Thread.currentThread(); - String[] bpList = volume.getBlockPoolList(); ScanInfoPerBlockPool result = new ScanInfoPerBlockPool(bpList.length); for (String bpid : bpList) {
