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 wa...@apache.org on 2014/09/23 23:11:24 UTC
git commit: HDFS-7132. hdfs namenode -metadataVersion command does
not honor configured name dirs. Contributed by Charles Lamb.
Repository: hadoop
Updated Branches:
refs/heads/trunk 3dc28e205 -> f48686a1a
HDFS-7132. hdfs namenode -metadataVersion command does not honor configured name dirs. Contributed by Charles Lamb.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f48686a1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f48686a1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f48686a1
Branch: refs/heads/trunk
Commit: f48686a1ad81823000534665a76264bba51182f4
Parents: 3dc28e2
Author: Andrew Wang <wa...@apache.org>
Authored: Tue Sep 23 14:10:02 2014 -0700
Committer: Andrew Wang <wa...@apache.org>
Committed: Tue Sep 23 14:10:02 2014 -0700
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 ++
.../hadoop/hdfs/server/namenode/NameNode.java | 3 ++
.../namenode/TestMetadataVersionOutput.java | 32 ++++++++++++++------
3 files changed, 28 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f48686a1/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 7cb19a0..4b7e857 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -795,6 +795,9 @@ Release 2.6.0 - UNRELEASED
HDFS-7001. Tests in TestTracing depends on the order of execution
(iwasakims via cmccabe)
+ HDFS-7132. hdfs namenode -metadataVersion command does not honor
+ configured name dirs. (Charles Lamb via wang)
+
BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS
HDFS-6387. HDFS CLI admin tool for creating & deleting an
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f48686a1/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 bcb5a86..217645a 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
@@ -1347,6 +1347,9 @@ public class NameNode implements NameNodeStatusMXBean {
*/
private static boolean printMetadataVersion(Configuration conf)
throws IOException {
+ final String nsId = DFSUtil.getNamenodeNameServiceId(conf);
+ final String namenodeId = HAUtil.getNameNodeId(conf, nsId);
+ NameNode.initializeGenericKeys(conf, nsId, namenodeId);
final FSImage fsImage = new FSImage(conf);
final FSNamesystem fs = new FSNamesystem(conf, fsImage, false);
return fsImage.recoverTransitionRead(
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f48686a1/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetadataVersionOutput.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetadataVersionOutput.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetadataVersionOutput.java
index 0e809cf..03c7557 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetadataVersionOutput.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetadataVersionOutput.java
@@ -25,27 +25,22 @@ import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.hdfs.protocol.HdfsConstants;
import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintStream;
+import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_NAME_DIR_KEY;
+import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMESERVICE_ID;
+import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_HA_NAMENODE_ID_KEY;
+import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_HA_NAMENODES_KEY_PREFIX;
+
public class TestMetadataVersionOutput {
private MiniDFSCluster dfsCluster = null;
private final Configuration conf = new Configuration();
- @Before
- public void setUp() throws Exception {
- dfsCluster = new MiniDFSCluster.Builder(conf).
- numDataNodes(1).
- checkExitOnShutdown(false).
- build();
- dfsCluster.waitClusterUp();
- }
-
@After
public void tearDown() throws Exception {
if (dfsCluster != null) {
@@ -54,9 +49,26 @@ public class TestMetadataVersionOutput {
Thread.sleep(2000);
}
+ private void initConfig() {
+ conf.set(DFS_NAMESERVICE_ID, "ns1");
+ conf.set(DFS_HA_NAMENODES_KEY_PREFIX + ".ns1", "nn1");
+ conf.set(DFS_HA_NAMENODE_ID_KEY, "nn1");
+ conf.set(DFS_NAMENODE_NAME_DIR_KEY + ".ns1.nn1", MiniDFSCluster.getBaseDirectory() + "1");
+ conf.unset(DFS_NAMENODE_NAME_DIR_KEY);
+ }
+
@Test(timeout = 30000)
public void testMetadataVersionOutput() throws IOException {
+ initConfig();
+ dfsCluster = new MiniDFSCluster.Builder(conf).
+ manageNameDfsDirs(false).
+ numDataNodes(1).
+ checkExitOnShutdown(false).
+ build();
+ dfsCluster.waitClusterUp();
+ dfsCluster.shutdown(false);
+ initConfig();
final PrintStream origOut = System.out;
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
final PrintStream stdOut = new PrintStream(baos);