HDFS-7916. 'reportBadBlocks' from datanodes to standby Node BPServiceActor goes for infinite loop (Contributed by Vinayakumar B)

Reverted earlier commit

(cherry picked from commit 318081ccd7af1ec02ec18f35ea95c579326be728)

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -44,9 +44,6 @@ Release 2.7.1 - UNRELEASED
     HDFS-8179. DFSClient#getServerDefaults returns null within 1
     hour of system start. (Xiaoyu Yao via Arpit Agarwal)
 
-    HDFS-7916. 'reportBadBlocks' from datanodes to standby Node BPServiceActor
-    goes for infinite loop (vinayakumarb)
-
     HDFS-8163. Using monotonicNow for block report scheduling causes
     test failures on recently restarted systems. (Arpit Agarwal)
 

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ReportBadBlockAction.java

@@ -26,7 +26,6 @@ import org.apache.hadoop.hdfs.protocol.ExtendedBlock;
 import org.apache.hadoop.hdfs.protocol.LocatedBlock;
 import org.apache.hadoop.hdfs.protocolPB.DatanodeProtocolClientSideTranslatorPB;
 import org.apache.hadoop.hdfs.server.protocol.DatanodeRegistration;
-import org.apache.hadoop.ipc.StandbyException;
 
 /**
  * ReportBadBlockAction is an instruction issued by {{BPOfferService}} to
@@ -60,9 +59,6 @@ public class ReportBadBlockAction implements BPServiceActorAction {
 
     try {
       bpNamenode.reportBadBlocks(locatedBlock);
-    } catch (StandbyException e) {
-      DataNode.LOG.warn("Failed to report bad block " + block
-          + " to standby namenode");
     } catch (IOException e) {
       throw new BPServiceActorActionException("Failed to report bad block "
           + block + " to namenode: ");