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 ae...@apache.org on 2016/06/18 16:54:17 UTC
[13/18] hadoop git commit: HDFS-9016. Display upgrade domain
information in fsck. (mingma)
HDFS-9016. Display upgrade domain information in fsck. (mingma)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/394bf117
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/394bf117
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/394bf117
Branch: refs/heads/HDFS-1312
Commit: 394bf117461ca1b2ea3c0d328ab627d6e2b470a5
Parents: c88012f
Author: Ming Ma <mi...@apache.org>
Authored: Tue Jun 14 20:05:50 2016 -0700
Committer: Anu Engineer <ae...@apache.org>
Committed: Sat Jun 18 00:05:02 2016 -0700
----------------------------------------------------------------------
.../hdfs/server/namenode/NamenodeFsck.java | 24 +++++--
.../org/apache/hadoop/hdfs/tools/DFSck.java | 16 +++--
.../src/site/markdown/HDFSCommands.md | 3 +-
.../hadoop/hdfs/server/namenode/TestFsck.java | 74 +++++++++++++++++++-
4 files changed, 103 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/394bf117/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java
index a85c68c..d7c9a78 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java
@@ -118,6 +118,7 @@ public class NamenodeFsck implements DataEncryptionKeyFactory {
public static final String DECOMMISSIONED_STATUS = "is DECOMMISSIONED";
public static final String NONEXISTENT_STATUS = "does not exist";
public static final String FAILURE_STATUS = "FAILED";
+ public static final String UNDEFINED = "undefined";
private final NameNode namenode;
private final BlockManager blockManager;
@@ -141,6 +142,7 @@ public class NamenodeFsck implements DataEncryptionKeyFactory {
private boolean showCorruptFileBlocks = false;
private boolean showReplicaDetails = false;
+ private boolean showUpgradeDomains = false;
private long staleInterval;
private Tracer tracer;
@@ -222,11 +224,15 @@ public class NamenodeFsck implements DataEncryptionKeyFactory {
else if (key.equals("racks")) { this.showRacks = true; }
else if (key.equals("replicadetails")) {
this.showReplicaDetails = true;
- }
- else if (key.equals("storagepolicies")) { this.showStoragePolcies = true; }
- else if (key.equals("showprogress")) { this.showprogress = true; }
- else if (key.equals("openforwrite")) {this.showOpenFiles = true; }
- else if (key.equals("listcorruptfileblocks")) {
+ } else if (key.equals("upgradedomains")) {
+ this.showUpgradeDomains = true;
+ } else if (key.equals("storagepolicies")) {
+ this.showStoragePolcies = true;
+ } else if (key.equals("showprogress")) {
+ this.showprogress = true;
+ } else if (key.equals("openforwrite")) {
+ this.showOpenFiles = true;
+ } else if (key.equals("listcorruptfileblocks")) {
this.showCorruptFileBlocks = true;
} else if (key.equals("startblockafter")) {
this.currentCookie[0] = pmap.get("startblockafter")[0];
@@ -550,7 +556,8 @@ public class NamenodeFsck implements DataEncryptionKeyFactory {
* For striped block group, display info of each internal block.
*/
private String getReplicaInfo(BlockInfo storedBlock) {
- if (!(showLocations || showRacks || showReplicaDetails)) {
+ if (!(showLocations || showRacks || showReplicaDetails ||
+ showUpgradeDomains)) {
return "";
}
final boolean isComplete = storedBlock.isComplete();
@@ -568,6 +575,11 @@ public class NamenodeFsck implements DataEncryptionKeyFactory {
sb.append(new DatanodeInfoWithStorage(dnDesc, storage.getStorageID(),
storage.getStorageType()));
}
+ if (showUpgradeDomains) {
+ String upgradeDomain = (dnDesc.getUpgradeDomain() != null) ?
+ dnDesc.getUpgradeDomain() : UNDEFINED;
+ sb.append("(ud=" + upgradeDomain +")");
+ }
if (showReplicaDetails) {
Collection<DatanodeDescriptor> corruptReplicas =
blockManager.getCorruptReplicas(storedBlock);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/394bf117/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java
index ab689ff..9cf234a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java
@@ -77,7 +77,8 @@ public class DFSck extends Configured implements Tool {
private static final String USAGE = "Usage: hdfs fsck <path> "
+ "[-list-corruptfileblocks | "
+ "[-move | -delete | -openforwrite] "
- + "[-files [-blocks [-locations | -racks | -replicaDetails]]]] "
+ + "[-files [-blocks [-locations | -racks | -replicaDetails | " +
+ "-upgradedomains]]]] "
+ "[-includeSnapshots] [-showprogress] "
+ "[-storagepolicies] [-blockId <blk_Id>]\n"
+ "\t<path>\tstart checking from this path\n"
@@ -95,6 +96,8 @@ public class DFSck extends Configured implements Tool {
+ "\t-files -blocks -racks"
+ "\tprint out network topology for data-node locations\n"
+ "\t-files -blocks -replicaDetails\tprint out each replica details \n"
+ + "\t-files -blocks -upgradedomains\tprint out upgrade domains for " +
+ "every block\n"
+ "\t-storagepolicies\tprint out storage policy summary for the blocks\n"
+ "\t-showprogress\tshow progress in output. Default is OFF (no progress)\n"
+ "\t-blockId\tprint out which file this blockId belongs to, locations"
@@ -272,10 +275,13 @@ public class DFSck extends Configured implements Tool {
else if (args[idx].equals("-racks")) { url.append("&racks=1"); }
else if (args[idx].equals("-replicaDetails")) {
url.append("&replicadetails=1");
- }
- else if (args[idx].equals("-storagepolicies")) { url.append("&storagepolicies=1"); }
- else if (args[idx].equals("-showprogress")) { url.append("&showprogress=1"); }
- else if (args[idx].equals("-list-corruptfileblocks")) {
+ } else if (args[idx].equals("-upgradedomains")) {
+ url.append("&upgradedomains=1");
+ } else if (args[idx].equals("-storagepolicies")) {
+ url.append("&storagepolicies=1");
+ } else if (args[idx].equals("-showprogress")) {
+ url.append("&showprogress=1");
+ } else if (args[idx].equals("-list-corruptfileblocks")) {
url.append("&listcorruptfileblocks=1");
doListCorruptFileBlocks = true;
} else if (args[idx].equals("-includeSnapshots")) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/394bf117/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md
index ff06fda..f868118 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md
@@ -118,7 +118,7 @@ Usage:
hdfs fsck <path>
[-list-corruptfileblocks |
[-move | -delete | -openforwrite]
- [-files [-blocks [-locations | -racks | -replicaDetails]]]
+ [-files [-blocks [-locations | -racks | -replicaDetails | -upgradedomains]]]
[-includeSnapshots] [-showprogress]
[-storagepolicies] [-blockId <blk_Id>]
@@ -131,6 +131,7 @@ Usage:
| `-files` `-blocks` `-locations` | Print out locations for every block. |
| `-files` `-blocks` `-racks` | Print out network topology for data-node locations. |
| `-files` `-blocks` `-replicaDetails` | Print out each replica details. |
+| `-files` `-blocks` `-upgradedomains` | Print out upgrade domains for every block. |
| `-includeSnapshots` | Include snapshot data if the given path indicates a snapshottable directory or there are snapshottable directories under it. |
| `-list-corruptfileblocks` | Print out list of missing blocks and files they belong to. |
| `-move` | Move corrupted files to /lost+found. |
http://git-wip-us.apache.org/repos/asf/hadoop/blob/394bf117/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
index 7cb6edc..73ad885 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
@@ -24,9 +24,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -81,6 +79,8 @@ import org.apache.hadoop.fs.StorageType;
import org.apache.hadoop.hdfs.client.HdfsClientConfigKeys;
import org.apache.hadoop.hdfs.protocol.Block;
import org.apache.hadoop.hdfs.protocol.CorruptFileBlocks;
+import org.apache.hadoop.hdfs.protocol.DatanodeAdminProperties;
+import org.apache.hadoop.hdfs.protocol.DatanodeID;
import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
import org.apache.hadoop.hdfs.protocol.ErasureCodingPolicy;
import org.apache.hadoop.hdfs.protocol.ExtendedBlock;
@@ -90,13 +90,16 @@ import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
import org.apache.hadoop.hdfs.server.blockmanagement.BlockCollection;
import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfo;
import org.apache.hadoop.hdfs.server.blockmanagement.BlockManager;
+import org.apache.hadoop.hdfs.server.blockmanagement.CombinedHostFileManager;
import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeDescriptor;
import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeManager;
+import org.apache.hadoop.hdfs.server.blockmanagement.HostConfigManager;
import org.apache.hadoop.hdfs.server.namenode.NamenodeFsck.Result;
import org.apache.hadoop.hdfs.server.namenode.NamenodeFsck.ReplicationResult;
import org.apache.hadoop.hdfs.server.namenode.NamenodeFsck.ErasureCodingResult;
import org.apache.hadoop.hdfs.server.protocol.NamenodeProtocols;
import org.apache.hadoop.hdfs.tools.DFSck;
+import org.apache.hadoop.hdfs.util.HostsFileWriter;
import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.net.NetworkTopology;
import org.apache.hadoop.security.AccessControlException;
@@ -2008,4 +2011,71 @@ public class TestFsck {
}
}
+ @Test(timeout = 60000)
+ public void testFsckUpgradeDomain() throws Exception {
+ testUpgradeDomain(false, false);
+ testUpgradeDomain(false, true);
+ testUpgradeDomain(true, false);
+ testUpgradeDomain(true, true);
+ }
+
+ private void testUpgradeDomain(boolean defineUpgradeDomain,
+ boolean displayUpgradeDomain) throws Exception {
+ final short replFactor = 1;
+ final short numDN = 1;
+ final long blockSize = 512;
+ final long fileSize = 1024;
+ final String upgradeDomain = "ud1";
+ final String[] racks = {"/rack1"};
+ final String[] hosts = {"127.0.0.1"};
+ HostsFileWriter hostsFileWriter = new HostsFileWriter();
+ Configuration conf = new Configuration();
+ conf.setLong(DFSConfigKeys.DFS_BLOCK_SIZE_KEY, blockSize);
+ conf.setInt(DFSConfigKeys.DFS_REPLICATION_KEY, replFactor);
+ if (defineUpgradeDomain) {
+ conf.setClass(DFSConfigKeys.DFS_NAMENODE_HOSTS_PROVIDER_CLASSNAME_KEY,
+ CombinedHostFileManager.class, HostConfigManager.class);
+ hostsFileWriter.initialize(conf, "temp/fsckupgradedomain");
+ }
+
+ MiniDFSCluster cluster;
+ DistributedFileSystem dfs;
+ cluster = new MiniDFSCluster.Builder(conf).numDataNodes(numDN).
+ hosts(hosts).racks(racks).build();
+ cluster.waitClusterUp();
+ dfs = cluster.getFileSystem();
+
+ // Configure the upgrade domain on the datanode
+ if (defineUpgradeDomain) {
+ DatanodeAdminProperties dnProp = new DatanodeAdminProperties();
+ DatanodeID datanodeID = cluster.getDataNodes().get(0).getDatanodeId();
+ dnProp.setHostName(datanodeID.getHostName());
+ dnProp.setPort(datanodeID.getXferPort());
+ dnProp.setUpgradeDomain(upgradeDomain);
+ hostsFileWriter.initIncludeHosts(new DatanodeAdminProperties[]{dnProp});
+ cluster.getFileSystem().refreshNodes();
+ }
+
+ // create files
+ final String testFile = new String("/testfile");
+ final Path path = new Path(testFile);
+ DFSTestUtil.createFile(dfs, path, fileSize, replFactor, 1000L);
+ DFSTestUtil.waitReplication(dfs, path, replFactor);
+ try {
+ String fsckOut = runFsck(conf, 0, true, testFile, "-files", "-blocks",
+ displayUpgradeDomain ? "-upgradedomains" : "-locations");
+ assertTrue(fsckOut.contains(NamenodeFsck.HEALTHY_STATUS));
+ String udValue = defineUpgradeDomain ? upgradeDomain :
+ NamenodeFsck.UNDEFINED;
+ assertEquals(displayUpgradeDomain,
+ fsckOut.contains("(ud=" + udValue + ")"));
+ } finally {
+ if (defineUpgradeDomain) {
+ hostsFileWriter.cleanup();
+ }
+ if (cluster != null) {
+ cluster.shutdown();
+ }
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org