From common-commits-return-85917-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Wed Jul 25 03:31:50 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 69D4818067C for ; Wed, 25 Jul 2018 03:31:49 +0200 (CEST) Received: (qmail 62741 invoked by uid 500); 25 Jul 2018 01:31:45 -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 62143 invoked by uid 99); 25 Jul 2018 01:31:45 -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; Wed, 25 Jul 2018 01:31:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7B73EE0C64; Wed, 25 Jul 2018 01:31:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: inigoiri@apache.org To: common-commits@hadoop.apache.org Date: Wed, 25 Jul 2018 01:31:56 -0000 Message-Id: <2837fba0de8d4464ae65951f071bee66@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [13/50] hadoop git commit: HDFS-13743. RBF: Router throws NullPointerException due to the invalid initialization of MountTableResolver. Contributed by Takanobu Asanuma. HDFS-13743. RBF: Router throws NullPointerException due to the invalid initialization of MountTableResolver. Contributed by Takanobu Asanuma. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7b25fb94 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7b25fb94 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7b25fb94 Branch: refs/heads/HADOOP-15461 Commit: 7b25fb949bf6f02df997beeca7df46c9e84c8d96 Parents: e6873df Author: Yiqun Lin Authored: Fri Jul 20 17:28:57 2018 +0800 Committer: Yiqun Lin Committed: Fri Jul 20 17:28:57 2018 +0800 ---------------------------------------------------------------------- .../federation/resolver/MountTableResolver.java | 28 +++++-- .../TestInitializeMountTableResolver.java | 82 ++++++++++++++++++++ 2 files changed, 102 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7b25fb94/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MountTableResolver.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MountTableResolver.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MountTableResolver.java index 3f6efd6..c264de3 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MountTableResolver.java +++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MountTableResolver.java @@ -17,6 +17,8 @@ */ package org.apache.hadoop.hdfs.server.federation.resolver; +import static org.apache.hadoop.hdfs.client.HdfsClientConfigKeys.DFS_NAMESERVICES; +import static org.apache.hadoop.hdfs.client.HdfsClientConfigKeys.DeprecatedKeys.DFS_NAMESERVICE_ID; import static org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys.DFS_ROUTER_DEFAULT_NAMESERVICE; import static org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys.FEDERATION_MOUNT_TABLE_MAX_CACHE_SIZE; import static org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys.FEDERATION_MOUNT_TABLE_MAX_CACHE_SIZE_DEFAULT; @@ -42,7 +44,6 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.hadoop.HadoopIllegalArgumentException; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdfs.DFSUtil; @@ -149,14 +150,25 @@ public class MountTableResolver * @param conf Configuration for this resolver. */ private void initDefaultNameService(Configuration conf) { - try { - this.defaultNameService = conf.get( - DFS_ROUTER_DEFAULT_NAMESERVICE, - DFSUtil.getNamenodeNameServiceId(conf)); - } catch (HadoopIllegalArgumentException e) { - LOG.error("Cannot find default name service, setting it to the first"); + this.defaultNameService = conf.get( + DFS_ROUTER_DEFAULT_NAMESERVICE, + DFSUtil.getNamenodeNameServiceId(conf)); + + if (defaultNameService == null) { + LOG.warn( + "{} and {} is not set. Fallback to {} as the default name service.", + DFS_ROUTER_DEFAULT_NAMESERVICE, DFS_NAMESERVICE_ID, DFS_NAMESERVICES); Collection nsIds = DFSUtilClient.getNameServiceIds(conf); - this.defaultNameService = nsIds.iterator().next(); + if (nsIds.isEmpty()) { + this.defaultNameService = ""; + } else { + this.defaultNameService = nsIds.iterator().next(); + } + } + + if (this.defaultNameService.equals("")) { + LOG.warn("Default name service is not set."); + } else { LOG.info("Default name service: {}", this.defaultNameService); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/7b25fb94/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/resolver/TestInitializeMountTableResolver.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/resolver/TestInitializeMountTableResolver.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/resolver/TestInitializeMountTableResolver.java new file mode 100644 index 0000000..5db7531 --- /dev/null +++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/resolver/TestInitializeMountTableResolver.java @@ -0,0 +1,82 @@ +/** + * 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.server.federation.resolver; + +import org.apache.hadoop.conf.Configuration; +import org.junit.Test; + +import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMESERVICE_ID; +import static org.apache.hadoop.hdfs.client.HdfsClientConfigKeys.DFS_NAMESERVICES; +import static org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys.DFS_ROUTER_DEFAULT_NAMESERVICE; +import static org.junit.Assert.assertEquals; + +/** + * Test {@link MountTableResolver} initialization. + */ +public class TestInitializeMountTableResolver { + + @Test + public void testDefaultNameserviceIsMissing() { + Configuration conf = new Configuration(); + MountTableResolver mountTable = new MountTableResolver(conf); + assertEquals("", mountTable.getDefaultNamespace()); + } + + @Test + public void testDefaultNameserviceWithEmptyString() { + Configuration conf = new Configuration(); + conf.set(DFS_ROUTER_DEFAULT_NAMESERVICE, ""); + MountTableResolver mountTable = new MountTableResolver(conf); + assertEquals("", mountTable.getDefaultNamespace()); + } + + @Test + public void testRouterDefaultNameservice() { + Configuration conf = new Configuration(); + conf.set(DFS_ROUTER_DEFAULT_NAMESERVICE, "router_ns"); // this is priority + conf.set(DFS_NAMESERVICE_ID, "ns_id"); + conf.set(DFS_NAMESERVICES, "nss"); + MountTableResolver mountTable = new MountTableResolver(conf); + assertEquals("router_ns", mountTable.getDefaultNamespace()); + } + + @Test + public void testNameserviceID() { + Configuration conf = new Configuration(); + conf.set(DFS_NAMESERVICE_ID, "ns_id"); // this is priority + conf.set(DFS_NAMESERVICES, "nss"); + MountTableResolver mountTable = new MountTableResolver(conf); + assertEquals("ns_id", mountTable.getDefaultNamespace()); + } + + @Test + public void testSingleNameservices() { + Configuration conf = new Configuration(); + conf.set(DFS_NAMESERVICES, "ns1"); + MountTableResolver mountTable = new MountTableResolver(conf); + assertEquals("ns1", mountTable.getDefaultNamespace()); + } + + @Test + public void testMultipleNameservices() { + Configuration conf = new Configuration(); + conf.set(DFS_NAMESERVICES, "ns1,ns2"); + MountTableResolver mountTable = new MountTableResolver(conf); + assertEquals("ns1", mountTable.getDefaultNamespace()); + } +} \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org