update option and tests for root delete

Author: monthonk

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractRootDirectoryTest.java

@@ -80,19 +80,19 @@ public void testRmEmptyRootDirRecursive() throws Throwable {
     skipIfUnsupported(TEST_ROOT_TESTS_ENABLED);
     Path root = new Path("/");
     assertIsDirectory(root);
-    if (isSupported(SUPPORTS_ROOT_DELETE)) {
-      boolean deleted = getFileSystem().delete(root, true);
-      LOG.info("rm -r / of empty dir result is {}", deleted);
-      assertIsDirectory(root);
-    } else {
-      // An exception is expected from unsupported file system
+    if (isSupported(ROOT_DELETE_INCOMPATIBLE_FS)) {
+      // Root delete incompatible file systems should throw an exception on calling
       try {
         boolean deleted = getFileSystem().delete(root, true);
-        fail("unsupported file system should have raised an exception," +
+        fail("incompatible file system should have raised an exception," +
             " but completed with exit code " + deleted);
       } catch (IOException e) {
         handleExpectedException(e);
       }
+    } else {
+      boolean deleted = getFileSystem().delete(root, true);
+      LOG.info("rm -r / of empty dir result is {}", deleted);
+      assertIsDirectory(root);
     }
   }
 
@@ -130,19 +130,19 @@ public Void call() throws Exception {
         },
         new LambdaTestUtils.ProportionalRetryInterval(50, 1000));
     // then try to delete the empty one
-    if (isSupported(SUPPORTS_ROOT_DELETE)) {
-      boolean deleted = fs.delete(root, false);
-      LOG.info("rm / of empty dir result is {}", deleted);
-      assertIsDirectory(root);
-    } else {
-      // An exception is expected from unsupported file system
+    if (isSupported(ROOT_DELETE_INCOMPATIBLE_FS)) {
+      // Root delete incompatible file systems should throw an exception on calling
       try {
         boolean deleted = getFileSystem().delete(root, true);
-        fail("unsupported file system should have raised an exception," +
+        fail("incompatible file system should have raised an exception," +
             " but completed with exit code " + deleted);
       } catch (IOException e) {
         handleExpectedException(e);
       }
+    } else {
+      boolean deleted = fs.delete(root, false);
+      LOG.info("rm / of empty dir result is {}", deleted);
+      assertIsDirectory(root);
     }
   }
 
@@ -179,7 +179,16 @@ public void testRmRootRecursive() throws Throwable {
     Path file = new Path("/testRmRootRecursive");
     try {
       ContractTestUtils.touch(getFileSystem(), file);
-      if (isSupported(SUPPORTS_ROOT_DELETE)) {
+      if (isSupported(ROOT_DELETE_INCOMPATIBLE_FS)) {
+        // Root delete incompatible file systems should throw an exception on calling
+        try {
+          boolean deleted = getFileSystem().delete(root, true);
+          fail("incompatible file system should have raised an exception," +
+              " but completed with exit code " + deleted);
+        } catch (IOException e) {
+          handleExpectedException(e);
+        }
+      } else {
         boolean deleted = getFileSystem().delete(root, true);
         assertIsDirectory(root);
         LOG.info("rm -rf / result is {}", deleted);
@@ -188,15 +197,6 @@ public void testRmRootRecursive() throws Throwable {
         } else {
           assertPathExists("expected file to be preserved", file);
         }
-      } else {
-        // An exception is expected from unsupported file system
-        try {
-          boolean deleted = getFileSystem().delete(root, true);
-          fail("unsupported file system should have raised an exception," +
-              " but completed with exit code " + deleted);
-        } catch (IOException e) {
-          handleExpectedException(e);
-        }
       }
     } finally{
       getFileSystem().delete(file, false);

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/ContractOptions.java

@@ -235,10 +235,10 @@ public interface ContractOptions {
   String TEST_ROOT_TESTS_ENABLED = "test.root-tests-enabled";
 
   /**
-   * Does the FS support root directory delete?
+   * Indicates that FS is incompatible with root delete.
    * {@value}
    */
-  String SUPPORTS_ROOT_DELETE = "supports-root-delete";
+  String ROOT_DELETE_INCOMPATIBLE_FS = "root-delete-incompatible-fs";
 
   /**
    * Limit for #of random seeks to perform.

hadoop-tools/hadoop-aws/src/test/resources/contract/s3a.xml

@@ -148,7 +148,7 @@
   </property>
 
   <property>
-    <name>fs.contract.supports-root-delete</name>
-    <value>false</value>
+    <name>fs.contract.root-delete-incompatible-fs</name>
+    <value>true</value>
   </property>
 </configuration>