You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by vi...@apache.org on 2016/10/27 06:49:40 UTC
hadoop git commit: HDFS-9929. Duplicate keys in
NAMENODE_SPECIFIC_KEYS (Contributed by Akira Ajisaka)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 3a167669a -> 72ce62753
HDFS-9929. Duplicate keys in NAMENODE_SPECIFIC_KEYS (Contributed by Akira Ajisaka)
(cherry picked from commit f0642b02996ae90d85499ddef2e20bdf88d98c7b)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/72ce6275
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/72ce6275
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/72ce6275
Branch: refs/heads/branch-2
Commit: 72ce62753396ef2c9f15a55ca009faf973244543
Parents: 3a16766
Author: Vinayakumar B <vi...@apache.org>
Authored: Thu Oct 27 12:17:05 2016 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Thu Oct 27 12:19:08 2016 +0530
----------------------------------------------------------------------
.../hadoop/hdfs/server/namenode/NameNode.java | 1 -
.../namenode/TestNameNodeConfiguration.java | 40 ++++++++++++++++++++
2 files changed, 40 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/72ce6275/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
index 6521712..41a7521 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
@@ -268,7 +268,6 @@ public class NameNode extends ReconfigurableBase implements
DFS_NAMENODE_KERBEROS_INTERNAL_SPNEGO_PRINCIPAL_KEY,
DFS_HA_FENCE_METHODS_KEY,
DFS_HA_ZKFC_PORT_KEY,
- DFS_HA_FENCE_METHODS_KEY
};
/**
http://git-wip-us.apache.org/repos/asf/hadoop/blob/72ce6275/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeConfiguration.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeConfiguration.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeConfiguration.java
new file mode 100644
index 0000000..c42c3d9
--- /dev/null
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeConfiguration.java
@@ -0,0 +1,40 @@
+/**
+ * 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.namenode;
+
+import org.junit.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.Assert.assertTrue;
+
+public class TestNameNodeConfiguration {
+
+ /**
+ * Detect duplicate keys in {@link NameNode#NAMENODE_SPECIFIC_KEYS}.
+ */
+ @Test
+ public void testNameNodeSpecificKeys() {
+ Set<String> keySet = new HashSet<>();
+ for (String key : NameNode.NAMENODE_SPECIFIC_KEYS) {
+ assertTrue("Duplicate key: " + key
+ + " in NameNode.NAMENODE_SPECIFIC_KEYS.", keySet.add(key));
+ }
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org