From aea31eee78a287f251447686ba3f5bbcfe9c60a3 Mon Sep 17 00:00:00 2001 From: Uma Maheswara Rao G Date: Sun, 7 Feb 2016 20:50:47 -0800 Subject: [PATCH] HDFS-9713. DataXceiver#copyBlock should return if block is pinned. Contributed by Uma Maheswara Rao G. --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../org/apache/hadoop/hdfs/server/datanode/DataXceiver.java | 1 + 2 files changed, 4 insertions(+) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index c79e0b56321..6c448eb74e1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -2710,6 +2710,9 @@ Release 2.8.0 - UNRELEASED HDFS-9761. Rebalancer sleeps too long between iterations (Mingliang Liu via cnauroth) + HDFS-9713. DataXceiver#copyBlock should return if block is pinned. + (umamahesh) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java index 190e69c34a2..99eb6fa8e92 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java @@ -995,6 +995,7 @@ class DataXceiver extends Receiver implements Runnable { "to " + peer.getRemoteAddressString() + " because it's pinned "; LOG.info(msg); sendResponse(ERROR, msg); + return; } if (!dataXceiverServer.balanceThrottler.acquire()) { // not able to start