Author: arp
Date: Mon Dec 16 18:16:56 2013
New Revision: 1551296
URL: http://svn.apache.org/r1551296
Log:
HDFS-5454. DataNode UUID should be assigned prior to FsDataset initialization.
(Arpit Agarwal)
Added:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeInitStorage.java
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1551296&r1=1551295&r2=1551296&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Mon Dec 16
18:16:56 2013
@@ -457,6 +457,9 @@ Trunk (Unreleased)
HDFS-5406. Send incremental block reports for all storages in a
single call. (Arpit Agarwal)
+ HDFS-5454. DataNode UUID should be assigned prior to FsDataset
+ initialization. (Arpit Agarwal)
+
BREAKDOWN OF HDFS-2832 SUBTASKS AND RELATED JIRAS
HDFS-4985. Add storage type to the protocol and expose it in block report
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java?rev=1551296&r1=1551295&r2=1551296&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
(original)
+++
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
Mon Dec 16 18:16:56 2013
@@ -815,8 +815,6 @@ public class DataNode extends Configured
storageInfo = new StorageInfo(nsInfo);
}
- checkDatanodeUuid();
-
DatanodeID dnId = new DatanodeID(
streamingAddr.getAddress().getHostAddress(), hostName,
storage.getDatanodeUuid(), getXferPort(), getInfoPort(),
@@ -965,6 +963,9 @@ public class DataNode extends Configured
+ ";nsInfo=" + nsInfo + ";dnuuid=" + storage.getDatanodeUuid());
}
+ // If this is a newly formatted DataNode then assign a new DatanodeUuid.
+ checkDatanodeUuid();
+
synchronized(this) {
if (data == null) {
data = factory.newInstance(this, storage, conf);
Added:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeInitStorage.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeInitStorage.java?rev=1551296&view=auto
==============================================================================
---
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeInitStorage.java
(added)
+++
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeInitStorage.java
Mon Dec 16 18:16:56 2013
@@ -0,0 +1,87 @@
+/**
+ * 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.datanode;
+
+import java.io.*;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.DFSConfigKeys;
+import org.apache.hadoop.hdfs.HdfsConfiguration;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.server.datanode.fsdataset.FsDatasetSpi;
+import org.junit.Test;
+
+import static org.hamcrest.core.IsNot.not;
+import static org.junit.Assert.*;
+
+
+/**
+ * Test to verify that the DataNode Uuid is correctly initialized before
+ * FsDataSet initialization.
+ */
+public class TestDataNodeInitStorage {
+ public static final Log LOG =
LogFactory.getLog(TestDataNodeInitStorage.class);
+
+ static private class SimulatedFsDatasetVerifier extends SimulatedFSDataset {
+ static class Factory extends FsDatasetSpi.Factory<SimulatedFSDataset> {
+ @Override
+ public SimulatedFsDatasetVerifier newInstance(
+ DataNode datanode, DataStorage storage,
+ Configuration conf) throws IOException {
+ return new SimulatedFsDatasetVerifier(storage, conf);
+ }
+
+ @Override
+ public boolean isSimulated() {
+ return true;
+ }
+ }
+
+ public static void setFactory(Configuration conf) {
+ conf.set(DFSConfigKeys.DFS_DATANODE_FSDATASET_FACTORY_KEY,
+ Factory.class.getName());
+ }
+
+ // This constructor does the actual verification by ensuring that
+ // the DatanodeUuid is initialized.
+ public SimulatedFsDatasetVerifier(DataStorage storage, Configuration conf)
{
+ super(storage, conf);
+ LOG.info("Assigned DatanodeUuid is " + storage.getDatanodeUuid());
+ assert(storage.getDatanodeUuid() != null);
+ assert(storage.getDatanodeUuid().length() != 0);
+ }
+ }
+
+
+ @Test (timeout = 60000)
+ public void testDataNodeInitStorage() throws Throwable {
+ // Create configuration to use SimulatedFsDatasetVerifier#Factory.
+ Configuration conf = new HdfsConfiguration();
+ SimulatedFsDatasetVerifier.setFactory(conf);
+
+ // Start a cluster so that SimulatedFsDatasetVerifier constructor is
+ // invoked.
+ MiniDFSCluster cluster =
+ new MiniDFSCluster.Builder(conf).numDataNodes(1).build();
+ cluster.waitActive();
+ cluster.shutdown();
+ }
+}
