Repository: hadoop Updated Branches: refs/heads/branch-2.8 f4bcc76df -> 5690e1120
HDFS-9713. DataXceiver#copyBlock should return if block is pinned. Contributed by Uma Maheswara Rao G. (cherry picked from commit aea31eee78a287f251447686ba3f5bbcfe9c60a3) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5690e112 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5690e112 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5690e112 Branch: refs/heads/branch-2.8 Commit: 5690e1120634789a2e99a5c7fca920f74c49802c Parents: f4bcc76 Author: Uma Maheswara Rao G <uma.ganguma...@intel.com> Authored: Sun Feb 7 20:50:47 2016 -0800 Committer: Uma Maheswara Rao G <uma.ganguma...@intel.com> Committed: Sun Feb 7 20:59:35 2016 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java | 1 + 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5690e112/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 43ce10e..9aec98f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1727,6 +1727,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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/5690e112/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java ---------------------------------------------------------------------- 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 83ebb50..cb5bb71 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
