hadoop git commit: HDFS-8521. Add VisibleForTesting annotation to BlockPoolSlice#selectReplicaToDelete. (cmccabe)

[cmccabe]

Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 323ffccfe -> a7058caa7


HDFS-8521. Add VisibleForTesting annotation to 
BlockPoolSlice#selectReplicaToDelete. (cmccabe)

(cherry picked from commit 806e407ac8896c4e669dba1fcf86fa5d6fee7c6d)
(cherry picked from commit 12497b0543176306edbd5cd8660a59b1e2e3a1c8)

Conflicts:
        
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a7058caa
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a7058caa
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a7058caa

Branch: refs/heads/branch-2.7
Commit: a7058caa729bbaf5ae0e46d2372c40d06b936337
Parents: 323ffcc
Author: Colin Patrick Mccabe <cmcc...@cloudera.com>
Authored: Tue Jun 2 20:06:28 2015 -0700
Committer: Colin Patrick Mccabe <cmcc...@cloudera.com>
Committed: Tue Jun 2 20:07:35 2015 -0700

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                       | 3 +++
 .../hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java       | 3 +++
 2 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a7058caa/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 63aee57..dbe42dd 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -22,6 +22,9 @@ Release 2.7.1 - UNRELEASED
     HDFS-8213. DFSClient should use hdfs.client.htrace HTrace configuration
     prefix rather than hadoop.htrace (cmccabe)
 
+    HDFS-8521. Add VisibleForTesting annotation to
+    BlockPoolSlice#selectReplicaToDelete. (cmccabe)
+
   OPTIMIZATIONS
 
   BUG FIXES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a7058caa/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java
----------------------------------------------------------------------
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java
index 003a362..f372495 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java
@@ -55,6 +55,8 @@ import org.apache.hadoop.util.DiskChecker.DiskErrorException;
 import org.apache.hadoop.util.ShutdownHookManager;
 import org.apache.hadoop.util.Time;
 
+import com.google.common.annotations.VisibleForTesting;
+
 /**
  * A block pool slice represents a portion of a block pool stored on a volume. 
 
  * Taken together, all BlockPoolSlices sharing a block pool ID across a 
@@ -545,6 +547,7 @@ class BlockPoolSlice {
     return replicaToKeep;
   }
 
+  @VisibleForTesting
   static ReplicaInfo selectReplicaToDelete(final ReplicaInfo replica1,
       final ReplicaInfo replica2) {
     ReplicaInfo replicaToKeep;