Merge HDFS-5344. Make LsSnapshottableDir as Tool interface implementation. Contributed by Sathish.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538158 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uma Maheswara Rao G 2013-11-02 09:07:59 +00:00
parent 98575f07cc
commit 7d86f49109
2 changed files with 17 additions and 7 deletions

View File

@ -155,6 +155,8 @@ Release 2.2.1 - UNRELEASED
report to a configurable value. (Aaron T. Myers via Colin Patrick report to a configurable value. (Aaron T. Myers via Colin Patrick
McCabe) McCabe)
HDFS-5344. Make LsSnapshottableDir as Tool interface implementation. (Sathish via umamahesh)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

View File

@ -21,9 +21,12 @@ import java.io.IOException;
import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.hdfs.DistributedFileSystem; import org.apache.hadoop.hdfs.DistributedFileSystem;
import org.apache.hadoop.hdfs.protocol.SnapshottableDirectoryStatus; import org.apache.hadoop.hdfs.protocol.SnapshottableDirectoryStatus;
import org.apache.hadoop.util.Tool;
import org.apache.hadoop.util.ToolRunner;
/** /**
* A tool used to list all snapshottable directories that are owned by the * A tool used to list all snapshottable directories that are owned by the
@ -31,23 +34,23 @@ import org.apache.hadoop.hdfs.protocol.SnapshottableDirectoryStatus;
* is a super user. * is a super user.
*/ */
@InterfaceAudience.Private @InterfaceAudience.Private
public class LsSnapshottableDir { public class LsSnapshottableDir extends Configured implements Tool {
public static void main(String[] argv) throws IOException { @Override
public int run(String[] argv) throws Exception {
String description = "LsSnapshottableDir: \n" + String description = "LsSnapshottableDir: \n" +
"\tGet the list of snapshottable directories that are owned by the current user.\n" + "\tGet the list of snapshottable directories that are owned by the current user.\n" +
"\tReturn all the snapshottable directories if the current user is a super user.\n"; "\tReturn all the snapshottable directories if the current user is a super user.\n";
if(argv.length != 0) { if(argv.length != 0) {
System.err.println("Usage: \n" + description); System.err.println("Usage: \n" + description);
System.exit(1); return 1;
} }
Configuration conf = new Configuration(); FileSystem fs = FileSystem.get(getConf());
FileSystem fs = FileSystem.get(conf);
if (! (fs instanceof DistributedFileSystem)) { if (! (fs instanceof DistributedFileSystem)) {
System.err.println( System.err.println(
"LsSnapshottableDir can only be used in DistributedFileSystem"); "LsSnapshottableDir can only be used in DistributedFileSystem");
System.exit(1); return 1;
} }
DistributedFileSystem dfs = (DistributedFileSystem) fs; DistributedFileSystem dfs = (DistributedFileSystem) fs;
@ -57,7 +60,12 @@ public class LsSnapshottableDir {
} catch (IOException e) { } catch (IOException e) {
String[] content = e.getLocalizedMessage().split("\n"); String[] content = e.getLocalizedMessage().split("\n");
System.err.println("lsSnapshottableDir: " + content[0]); System.err.println("lsSnapshottableDir: " + content[0]);
return 1;
} }
return 0;
}
public static void main(String[] argv) throws Exception {
int rc = ToolRunner.run(new LsSnapshottableDir(), argv);
System.exit(rc);
} }
} }