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 ar...@apache.org on 2013/09/23 20:13:11 UTC
svn commit: r1525662 - in
/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src:
main/java/org/apache/hadoop/fs/shell/SetReplication.java
site/apt/FileSystemShell.apt.vm test/resources/testConf.xml
Author: arp
Date: Mon Sep 23 18:13:11 2013
New Revision: 1525662
URL: http://svn.apache.org/r1525662
Log:
HDFS-5139. Merge r1525661 from branch-2 to branch-2.1-beta.
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/SetReplication.java
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/site/apt/FileSystemShell.apt.vm
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/SetReplication.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/SetReplication.java?rev=1525662&r1=1525661&r2=1525662&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/SetReplication.java (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/SetReplication.java Mon Sep 23 18:13:11 2013
@@ -39,11 +39,14 @@ class SetReplication extends FsCommand {
}
public static final String NAME = "setrep";
- public static final String USAGE = "[-R] [-w] <rep> <path/file> ...";
+ public static final String USAGE = "[-R] [-w] <rep> <path> ...";
public static final String DESCRIPTION =
- "Set the replication level of a file.\n" +
- "The -R flag requests a recursive change of replication level\n" +
- "for an entire tree.";
+ "Set the replication level of a file. If <path> is a directory\n" +
+ "then the command recursively changes the replication factor of\n" +
+ "all files under the directory tree rooted at <path>.\n" +
+ "The -w flag requests that the command wait for the replication\n" +
+ "to complete. This can potentially take a very long time.\n" +
+ "The -R flag is accepted for backwards compatibility. It has no effect.";
protected short newRep = 0;
protected List<PathData> waitList = new LinkedList<PathData>();
@@ -54,7 +57,7 @@ class SetReplication extends FsCommand {
CommandFormat cf = new CommandFormat(2, Integer.MAX_VALUE, "R", "w");
cf.parse(args);
waitOpt = cf.getOpt("w");
- setRecursive(cf.getOpt("R"));
+ setRecursive(true);
try {
newRep = Short.parseShort(args.removeFirst());
@@ -126,4 +129,4 @@ class SetReplication extends FsCommand {
out.println(" done");
}
}
-}
\ No newline at end of file
+}
Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/site/apt/FileSystemShell.apt.vm
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/site/apt/FileSystemShell.apt.vm?rev=1525662&r1=1525661&r2=1525662&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/site/apt/FileSystemShell.apt.vm (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/site/apt/FileSystemShell.apt.vm Mon Sep 23 18:13:11 2013
@@ -381,17 +381,22 @@ rmr
setrep
- Usage: <<<hdfs dfs -setrep [-R] <path> >>>
+ Usage: <<<hdfs dfs -setrep [-R] [-w] <numRepicas> <path> >>>
- Changes the replication factor of a file.
+ Changes the replication factor of a file. If <path> is a directory then
+ the command recursively changes the replication factor of all files under
+ the directory tree rooted at <path>.
Options:
- * The -R option will recursively increase the replication factor of files within a directory.
+ * The -w flag requests that the command wait for the replication
+ to complete. This can potentially take a very long time.
+
+ * The -R flag is accepted for backwards compatibility. It has no effect.
Example:
- * <<<hdfs dfs -setrep -w 3 -R /user/hadoop/dir1>>>
+ * <<<hdfs dfs -setrep -w 3 /user/hadoop/dir1>>>
Exit Code:
Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml?rev=1525662&r1=1525661&r2=1525662&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml Mon Sep 23 18:13:11 2013
@@ -601,16 +601,28 @@
<comparators>
<comparator>
<type>RegexpComparator</type>
- <expected-output>^-setrep \[-R\] \[-w\] <rep> <path/file> \.\.\.:( |\t)*Set the replication level of a file.( )*</expected-output>
+ <expected-output>^-setrep \[-R\] \[-w\] <rep> <path> \.\.\.:( |\t)*Set the replication level of a file. If <path> is a directory( )*</expected-output>
</comparator>
<comparator>
<type>RegexpComparator</type>
- <expected-output>^( |\t)*The -R flag requests a recursive change of replication level( )*</expected-output>
+ <expected-output>^( |\t)*then the command recursively changes the replication factor of( )*</expected-output>
</comparator>
<comparator>
<type>RegexpComparator</type>
- <expected-output>^( |\t)*for an entire tree.( )*</expected-output>
+ <expected-output>^( |\t)*all files under the directory tree rooted at <path>\.( )*</expected-output>
</comparator>
+ <comparator>
+ <type>RegexpComparator</type>
+ <expected-output>^( |\t)*The -w flag requests that the command wait for the replication( )*</expected-output>
+ </comparator>
+ <comparator>
+ <type>RegexpComparator</type>
+ <expected-output>^( |\t)*to complete. This can potentially take a very long time\.( )*</expected-output>
+ </comparator>
+ <comparator>
+ <type>RegexpComparator</type>
+ <expected-output>^( |\t)*The -R flag is accepted for backwards compatibility\. It has no effect\.( )*</expected-output>
+ </comparator>
</comparators>
</test>