From e5420feb09ba174a1404e8d55bafe609f8b155e7 Mon Sep 17 00:00:00 2001
From: Walter Su <waltersu4549@apache.org>
Date: Tue, 10 Nov 2015 14:48:08 +0800
Subject: [PATCH] HDFS-9401. Fix findbugs warnings in BlockRecoveryWorker.
 Contributed by Brahma Reddy Battula.

(cherry picked from commit 2fda45b9dc9c0bf9bb1380134c80836e89d50471)
---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                | 3 +++
 .../hadoop-hdfs/dev-support/findbugsExcludeFile.xml        | 7 -------
 .../hadoop/hdfs/server/datanode/BlockRecoveryWorker.java   | 3 ++-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index e851519af5d..737e03fecf1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1430,6 +1430,9 @@ Release 2.8.0 - UNRELEASED
     HDFS-9249. NPE is thrown if an IOException is thrown in NameNode constructor.
     (Wei-Chiu Chuang via Yongjun Zhang)
 
+    HDFS-9401. Fix findbugs warnings in BlockRecoveryWorker.
+    (Brahma Reddy Battula via waltersu4549)
+
 Release 2.7.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-hdfs-project/hadoop-hdfs/dev-support/findbugsExcludeFile.xml b/hadoop-hdfs-project/hadoop-hdfs/dev-support/findbugsExcludeFile.xml
index c88c4c4ed26..3ae8b59d2bd 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/dev-support/findbugsExcludeFile.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/dev-support/findbugsExcludeFile.xml
@@ -124,13 +124,6 @@
        <Bug pattern="DM_EXIT" />
      </Match>
 
-     <!-- Don't complain about recoverBlock equality check -->
-     <Match>
-       <Class name="org.apache.hadoop.hdfs.server.datanode.DataNode" />
-       <Method name="recoverBlock" />
-       <Bug pattern="EC_UNRELATED_TYPES" />
-     </Match>
-
      <!-- More complex cleanup logic confuses findbugs -->
      <Match>
        <Class name="org.apache.hadoop.hdfs.qjournal.server.Journal" />
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockRecoveryWorker.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockRecoveryWorker.java
index ae95579a3bf..d710021611b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockRecoveryWorker.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockRecoveryWorker.java
@@ -112,7 +112,8 @@ public class BlockRecoveryWorker {
       // - Original state is RWR or better
       for(DatanodeID id : locs) {
         try {
-          DatanodeID bpReg =datanode.getBPOfferService(bpid).bpRegistration;
+          DatanodeID bpReg = new DatanodeID(
+              datanode.getBPOfferService(bpid).bpRegistration);
           InterDatanodeProtocol proxyDN = bpReg.equals(id)?
               datanode: DataNode.createInterDataNodeProtocolProxy(id, conf,
               dnConf.socketTimeout, dnConf.connectToDnViaHostname);