Repository: hadoop
Updated Branches:
refs/heads/branch-2.8 4d9001456 -> 019ca8f7c
HDFS-10280. Document new dfsadmin command -evictWriters. Contributed by
Wei-Chiu Chuang.
(cherry picked from commit c970f1d00525e4273075cff7406dcbd71305abd5)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/019ca8f7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/019ca8f7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/019ca8f7
Branch: refs/heads/branch-2.8
Commit: 019ca8f7c1bd339082e0a1fb715cba23b293f5e8
Parents: 4d90014
Author: Kihwal Lee <[email protected]>
Authored: Thu Apr 14 12:50:36 2016 -0500
Committer: Kihwal Lee <[email protected]>
Committed: Thu Apr 14 12:50:36 2016 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java | 4 ++++
.../hadoop-hdfs/src/site/markdown/HDFSCommands.md | 2 ++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/019ca8f7/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
----------------------------------------------------------------------
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
index 96b7542..531b60b 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
@@ -425,6 +425,7 @@ public class DFSAdmin extends FsShell {
"\t[-allowSnapshot <snapshotDir>]\n" +
"\t[-disallowSnapshot <snapshotDir>]\n" +
"\t[-shutdownDatanode <datanode_host:ipc_port> [upgrade]]\n" +
+ "\t[-evictWriters <datanode_host:ipc_port>]\n" +
"\t[-getDatanodeInfo <datanode_host:ipc_port>]\n" +
"\t[-metasave filename]\n" +
"\t[-triggerBlockReport [-incremental] <datanode_host:ipc_port>]\n" +
@@ -1717,6 +1718,9 @@ public class DFSAdmin extends FsShell {
} else if ("-shutdownDatanode".equals(cmd)) {
System.err.println("Usage: hdfs dfsadmin"
+ " [-shutdownDatanode <datanode_host:ipc_port> [upgrade]]");
+ } else if ("-evictWriters".equals(cmd)) {
+ System.err.println("Usage: hdfs dfsadmin"
+ + " [-evictWriters <datanode_host:ipc_port>]");
} else if ("-getDatanodeInfo".equals(cmd)) {
System.err.println("Usage: hdfs dfsadmin"
+ " [-getDatanodeInfo <datanode_host:ipc_port>]");
http://git-wip-us.apache.org/repos/asf/hadoop/blob/019ca8f7/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 f4ee836..9039a40 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md
@@ -347,6 +347,7 @@ Usage:
[-fetchImage <local directory>]
[-shutdownDatanode <datanode_host:ipc_port> [upgrade]]
[-getDatanodeInfo <datanode_host:ipc_port>]
+ [-evictWriters <datanode_host:ipc_port>]
[-triggerBlockReport [-incremental] <datanode_host:ipc_port>]
[-help [cmd]]
@@ -380,6 +381,7 @@ Usage:
| `-disallowSnapshot` \<snapshotDir\> | Disallowing snapshots of a directory
to be created. All snapshots of the directory must be deleted before
disallowing snapshots. See the [HDFS Snapshot
Documentation](./HdfsSnapshots.html) for more information. |
| `-fetchImage` \<local directory\> | Downloads the most recent fsimage from
the NameNode and saves it in the specified local directory. |
| `-shutdownDatanode` \<datanode\_host:ipc\_port\> [upgrade] | Submit a
shutdown request for the given datanode. See [Rolling Upgrade
document](./HdfsRollingUpgrade.html#dfsadmin_-shutdownDatanode) for the detail.
|
+| `-evictWriters` \<datanode\_host:ipc\_port\> | Make the datanode evict all
clients that are writing a block. This is useful if decommissioning is hung due
to slow writers. |
| `-getDatanodeInfo` \<datanode\_host:ipc\_port\> | Get the information about
the given datanode. See [Rolling Upgrade
document](./HdfsRollingUpgrade.html#dfsadmin_-getDatanodeInfo) for the detail. |
| `-triggerBlockReport` `[-incremental]` \<datanode\_host:ipc\_port\> |
Trigger a block report for the given datanode. If 'incremental' is specified,
it will be otherwise, it will be a full block report. |
| `-help` [cmd] | Displays help for the given command or all commands if none
is specified. |
