Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7854E18078 for ; Mon, 19 Oct 2015 23:13:23 +0000 (UTC) Received: (qmail 3539 invoked by uid 500); 19 Oct 2015 23:13:23 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 3467 invoked by uid 500); 19 Oct 2015 23:13:23 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 3458 invoked by uid 99); 19 Oct 2015 23:13:23 -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; Mon, 19 Oct 2015 23:13:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 115A2E0508; Mon, 19 Oct 2015 23:13:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wang@apache.org To: common-commits@hadoop.apache.org Message-Id: <65df5f09b58540dbbcbbc1eaf3ad7985@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-9250. Add Precondition check to LocatedBlock#addCachedLoc. Contributed by Xiao Chen. Date: Mon, 19 Oct 2015 23:13:23 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2 e86819c91 -> c35771c46 HDFS-9250. Add Precondition check to LocatedBlock#addCachedLoc. Contributed by Xiao Chen. (cherry picked from commit 8175c4f6b9fc17ff2e0fc568d798f9b6f2487696) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c35771c4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c35771c4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c35771c4 Branch: refs/heads/branch-2 Commit: c35771c46e261bf2b8e42e585e9a2ddc316c049e Parents: e86819c Author: Andrew Wang Authored: Mon Oct 19 16:12:56 2015 -0700 Committer: Andrew Wang Committed: Mon Oct 19 16:13:14 2015 -0700 ---------------------------------------------------------------------- .../hadoop/hdfs/protocol/LocatedBlock.java | 4 ++ hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 ++ .../hadoop/hdfs/protocol/TestLocatedBlock.java | 46 ++++++++++++++++++++ 3 files changed, 53 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c35771c4/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/LocatedBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/LocatedBlock.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/LocatedBlock.java index 7ddfb8c..65e3381 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/LocatedBlock.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/LocatedBlock.java @@ -20,6 +20,7 @@ package org.apache.hadoop.hdfs.protocol; import java.util.Arrays; import java.util.List; +import com.google.common.base.Preconditions; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.fs.StorageType; @@ -184,6 +185,9 @@ public class LocatedBlock { } // Not present in loc, add it and go cachedList.add(loc); + Preconditions.checkArgument(cachedLocs != EMPTY_LOCS, + "Cached locations should only be added when having a backing" + + " disk replica!", loc, locs.length, Arrays.toString(locs)); cachedLocs = cachedList.toArray(cachedLocs); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/c35771c4/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 c8ddebf..dbd333a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -706,6 +706,9 @@ Release 2.8.0 - UNRELEASED HDFS-9205. Do not schedule corrupt blocks for replication. (szetszwo) + HDFS-9250. Add Precondition check to LocatedBlock#addCachedLoc. + (Xiao Chen via wang) + OPTIMIZATIONS HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than http://git-wip-us.apache.org/repos/asf/hadoop/blob/c35771c4/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/TestLocatedBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/TestLocatedBlock.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/TestLocatedBlock.java new file mode 100644 index 0000000..e349da2 --- /dev/null +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/TestLocatedBlock.java @@ -0,0 +1,46 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.hdfs.protocol; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeDescriptor; +import org.junit.Test; + +import static org.junit.Assert.fail; + +public class TestLocatedBlock { + public static final Log LOG = LogFactory.getLog(TestLocatedBlock.class); + + @Test(timeout = 10000) + public void testAddCachedLocWhenEmpty() { + DatanodeInfo[] ds = new DatanodeInfo[0]; + ExtendedBlock b1 = new ExtendedBlock("bpid", 1, 1, 1); + LocatedBlock l1 = new LocatedBlock(b1, ds); + DatanodeDescriptor dn = new DatanodeDescriptor( + new DatanodeID("127.0.0.1", "localhost", "abcd", + 5000, 5001, 5002, 5003)); + try { + l1.addCachedLoc(dn); + fail("Adding dn when block is empty should throw"); + } catch (IllegalArgumentException e) { + LOG.info("Expected exception:", e); + } + } +} \ No newline at end of file