szetszwo commented on a change in pull request #2352:
URL: https://github.com/apache/hadoop/pull/2352#discussion_r497449607
##########
File path:
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
##########
@@ -2901,6 +2945,74 @@ private void provisionEZTrash(String path, FsPermission
trashPermission)
setPermission(trashPath, trashPermission);
}
+ /**
+ * HDFS only.
+ *
+ * Provision snapshottable directory trash.
+ * @param path Path to a snapshottable directory.
+ * @param trashPermission Expected FsPermission of the trash root.
+ * @throws IOException
+ */
+ public void provisionSnapshottableDirTrash(final Path path,
+ final FsPermission trashPermission) throws IOException {
+ Path absF = fixRelativePart(path);
+ new FileSystemLinkResolver<Void>() {
+ @Override
+ public Void doCall(Path p) throws IOException {
+ provisionSnapshottableDirTrash(getPathName(p), trashPermission);
+ return null;
+ }
+
+ @Override
+ public Void next(FileSystem fs, Path p) throws IOException {
+ if (fs instanceof DistributedFileSystem) {
+ DistributedFileSystem myDfs = (DistributedFileSystem)fs;
+ myDfs.provisionSnapshottableDirTrash(p, trashPermission);
+ return null;
+ }
+ throw new UnsupportedOperationException(
+ "Cannot provisionSnapshottableDirTrash through a symlink to" +
+ " a non-DistributedFileSystem: " + fs + " -> " + p);
+ }
+ }.resolve(this, absF);
+ }
+
+ private void provisionSnapshottableDirTrash(
+ String pathStr, FsPermission trashPermission) throws IOException {
+ Path path = new Path(pathStr);
Review comment:
Should isSnapshotTrashRootEnabled be checked here? If
isSnapshotTrashRootEnabled == false, all the provisionSnapshottableDirTrash
calls should fail.
##########
File path:
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
##########
@@ -1245,6 +1265,10 @@ private void printHelp(String cmd) {
String disallowSnapshot = "-disallowSnapshot <snapshotDir>:\n" +
"\tDo not allow snapshots to be taken on a directory any more.\n";
+ String provisionSnapshotTrash = "-provisionSnapshotTrash <snapshotDir>:\n"
+
+ "\tProvision trash root in a snapshottable directory with permission"
+ + "\t777 and sticky bit.\n";
Review comment:
Use the constant HdfsAdmin.TRASH_PERMISSION instead of harding coding it.
##########
File path:
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
##########
@@ -2901,6 +2945,74 @@ private void provisionEZTrash(String path, FsPermission
trashPermission)
setPermission(trashPath, trashPermission);
}
+ /**
+ * HDFS only.
+ *
+ * Provision snapshottable directory trash.
+ * @param path Path to a snapshottable directory.
+ * @param trashPermission Expected FsPermission of the trash root.
+ * @throws IOException
+ */
+ public void provisionSnapshottableDirTrash(final Path path,
Review comment:
Return the trash path.
##########
File path:
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
##########
@@ -782,14 +784,32 @@ public void allowSnapshot(String[] argv) throws
IOException {
*/
public void disallowSnapshot(String[] argv) throws IOException {
Path p = new Path(argv[1]);
- final DistributedFileSystem dfs = AdminHelper.getDFS(p.toUri(), getConf());
+ final HdfsAdmin admin = new HdfsAdmin(p.toUri(), getConf());
try {
- dfs.disallowSnapshot(p);
+ admin.disallowSnapshot(p);
} catch (SnapshotException e) {
throw new RemoteException(e.getClass().getName(), e.getMessage());
}
System.out.println("Disallowing snapshot on " + argv[1] + " succeeded");
}
+
+ /**
+ * Provision trash root in a snapshottable directory.
+ * Usage: hdfs dfsadmin -provisionSnapshotTrash snapshotDir
+ * @param argv List of of command line parameters.
+ * @exception IOException
+ */
+ public void provisionSnapshotTrash(String[] argv) throws IOException {
+ Path p = new Path(argv[1]);
+ final HdfsAdmin admin = new HdfsAdmin(p.toUri(), getConf());
+ try {
+ admin.provisionSnapshottableDirTrash(p);
+ } catch (SnapshotException e) {
+ throw new RemoteException(e.getClass().getName(), e.getMessage());
+ }
+ System.out.println("Provision of snapshot trash in " + argv[1] +
Review comment:
Print out the trash path.
##########
File path:
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
##########
@@ -2901,6 +2945,74 @@ private void provisionEZTrash(String path, FsPermission
trashPermission)
setPermission(trashPath, trashPermission);
}
+ /**
+ * HDFS only.
+ *
+ * Provision snapshottable directory trash.
+ * @param path Path to a snapshottable directory.
+ * @param trashPermission Expected FsPermission of the trash root.
+ * @throws IOException
+ */
+ public void provisionSnapshottableDirTrash(final Path path,
+ final FsPermission trashPermission) throws IOException {
+ Path absF = fixRelativePart(path);
+ new FileSystemLinkResolver<Void>() {
+ @Override
+ public Void doCall(Path p) throws IOException {
+ provisionSnapshottableDirTrash(getPathName(p), trashPermission);
+ return null;
+ }
+
+ @Override
+ public Void next(FileSystem fs, Path p) throws IOException {
+ if (fs instanceof DistributedFileSystem) {
+ DistributedFileSystem myDfs = (DistributedFileSystem)fs;
+ myDfs.provisionSnapshottableDirTrash(p, trashPermission);
+ return null;
+ }
+ throw new UnsupportedOperationException(
+ "Cannot provisionSnapshottableDirTrash through a symlink to" +
+ " a non-DistributedFileSystem: " + fs + " -> " + p);
+ }
+ }.resolve(this, absF);
+ }
+
+ private void provisionSnapshottableDirTrash(
Review comment:
Return the trash path.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: common-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-issues-h...@hadoop.apache.org
