HDFS-15607. Addendum: Create trash dir when allowing snapshottable dir (#2448)

smengcl · web-flow · commit fbd2220167fb · 2020-11-10T12:13:15.000-08:00
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
@@ -19,6 +19,7 @@
 package org.apache.hadoop.hdfs;
 
 
+import org.apache.hadoop.security.AccessControlException;
 import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
 import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
 import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
@@ -2146,7 +2147,7 @@ private void checkTrashRootAndRemoveIfEmpty(final Path p) throws IOException {
               trashRoot + ". Rename or delete it, then try again.");
         }
       }
-    } catch (FileNotFoundException ignored) {
+    } catch (FileNotFoundException | AccessControlException ignored) {
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`package org.apache.hadoop.hdfs;`
`20`	`20`
`21`	`21`
	`22`	`+import org.apache.hadoop.security.AccessControlException;`
`22`	`23`	`import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;`
`23`	`24`	`import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;`
`24`	`25`	`import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;`
`@@ -2146,7 +2147,7 @@ private void checkTrashRootAndRemoveIfEmpty(final Path p) throws IOException {`
`2146`	`2147`	`trashRoot + ". Rename or delete it, then try again.");`
`2147`	`2148`	`}`
`2148`	`2149`	`}`
`2149`		`- } catch (FileNotFoundException ignored) {`
	`2150`	`+ } catch (FileNotFoundException \| AccessControlException ignored) {`
`2150`	`2151`	`}`
`2151`	`2152`	`}`
`2152`	`2153`