This is an automated email from the ASF dual-hosted git repository.
siyao pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6d3312d HDFS-15539. When disallowing snapshot on a dir, throw
exception if its trash root is not empty (#2258)
6d3312d is described below
commit 6d3312de47e9f88ad283381fdb85e557d8ff58e6
Author: Siyao Meng <[email protected]>
AuthorDate: Mon Sep 14 13:31:34 2020 -0700
HDFS-15539. When disallowing snapshot on a dir, throw exception if its
trash root is not empty (#2258)
---
.../apache/hadoop/hdfs/DistributedFileSystem.java | 6 ++++
.../hadoop/hdfs/TestDistributedFileSystem.java | 32 ++++++++++++++++++++++
2 files changed, 38 insertions(+)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
index 1d5c5af..f4fb621 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
+++
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
@@ -2068,6 +2068,12 @@ public class DistributedFileSystem extends FileSystem
new FileSystemLinkResolver<Void>() {
@Override
public Void doCall(final Path p) throws IOException {
+ String ssTrashRoot =
+ new Path(p, FileSystem.TRASH_PREFIX).toUri().getPath();
+ if (dfs.exists(ssTrashRoot)) {
+ throw new IOException("Found trash root under path " + p + ". "
+ + "Please remove or move the trash root and then try again.");
+ }
dfs.disallowSnapshot(getPathName(p));
return null;
}
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDistributedFileSystem.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDistributedFileSystem.java
index 6824fe6..37b2350 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDistributedFileSystem.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDistributedFileSystem.java
@@ -2269,6 +2269,7 @@ public class TestDistributedFileSystem {
assertEquals(trashRootsAfter2.size() + 1, trashRootsAfter3.size());
// Cleanup
+ dfs.delete(new Path(testDir, FileSystem.TRASH_PREFIX), true);
dfs.disallowSnapshot(testDir);
dfs.delete(testDir, true);
} finally {
@@ -2323,6 +2324,7 @@ public class TestDistributedFileSystem {
assertEquals(trashRoots, trashRootsAfter);
// Cleanup
+ dfs.delete(new Path(testDir, FileSystem.TRASH_PREFIX), true);
dfs.disallowSnapshot(testDir);
dfs.delete(testDir, true);
} finally {
@@ -2452,4 +2454,34 @@ public class TestDistributedFileSystem {
}
}
}
+
+ @Test
+ public void testDisallowSnapshotShouldThrowWhenTrashRootExists()
+ throws Exception {
+ Configuration conf = getTestConfiguration();
+ MiniDFSCluster cluster =
+ new MiniDFSCluster.Builder(conf).numDataNodes(1).build();
+ try {
+ DistributedFileSystem dfs = cluster.getFileSystem();
+ Path testDir = new Path("/disallowss/test1/");
+ Path file0path = new Path(testDir, "file-0");
+ dfs.create(file0path);
+ dfs.allowSnapshot(testDir);
+ // Create trash root manually
+ Path testDirTrashRoot = new Path(testDir, FileSystem.TRASH_PREFIX);
+ dfs.mkdirs(testDirTrashRoot);
+ // Try disallowing snapshot, should throw
+ LambdaTestUtils.intercept(IOException.class,
+ () -> dfs.disallowSnapshot(testDir));
+ // Remove the trash root and try again, should pass this time
+ dfs.delete(testDirTrashRoot, true);
+ dfs.disallowSnapshot(testDir);
+ // Cleanup
+ dfs.delete(testDir, true);
+ } finally {
+ if (cluster != null) {
+ cluster.shutdown();
+ }
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
