Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A0EB4200D64 for ; Tue, 12 Dec 2017 01:43:09 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 9F67E160C22; Tue, 12 Dec 2017 00:43:09 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E654D160C13 for ; Tue, 12 Dec 2017 01:43:08 +0100 (CET) Received: (qmail 48792 invoked by uid 500); 12 Dec 2017 00:43:08 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 48783 invoked by uid 99); 12 Dec 2017 00:43:07 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Dec 2017 00:43:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D4D7ADFBAA; Tue, 12 Dec 2017 00:43:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: weichiu@apache.org To: common-commits@hadoop.apache.org Message-Id: <690e5b9ac4164f6ba4831c38e37bfb20@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-12891. Do not invalidate blocks if toInvalidate is empty. Contributed by Zsolt Venczel. Date: Tue, 12 Dec 2017 00:43:07 +0000 (UTC) archived-at: Tue, 12 Dec 2017 00:43:09 -0000 Repository: hadoop Updated Branches: refs/heads/trunk 5cd1056ad -> 55fc2d648 HDFS-12891. Do not invalidate blocks if toInvalidate is empty. Contributed by Zsolt Venczel. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/55fc2d64 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/55fc2d64 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/55fc2d64 Branch: refs/heads/trunk Commit: 55fc2d6485702a99c6d4bb261a720d1f0498af2b Parents: 5cd1056 Author: Wei-Chiu Chuang Authored: Mon Dec 11 16:42:25 2017 -0800 Committer: Wei-Chiu Chuang Committed: Mon Dec 11 16:43:03 2017 -0800 ---------------------------------------------------------------------- .../hadoop/hdfs/server/blockmanagement/InvalidateBlocks.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/55fc2d64/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/InvalidateBlocks.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/InvalidateBlocks.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/InvalidateBlocks.java index 75561ca..ff68c02 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/InvalidateBlocks.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/InvalidateBlocks.java @@ -293,10 +293,12 @@ class InvalidateBlocks { getBlocksToInvalidateByLimit(nodeToECBlocks.get(dn), toInvalidate, numECBlocks, remainingLimit); } - if (toInvalidate.size() > 0 && getBlockSetsSize(dn) == 0) { - remove(dn); + if (toInvalidate.size() > 0) { + if (getBlockSetsSize(dn) == 0) { + remove(dn); + } + dn.addBlocksToBeInvalidated(toInvalidate); } - dn.addBlocksToBeInvalidated(toInvalidate); return toInvalidate; } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org