HADOOP-13294. Test hadoop fs shell against s3a

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

@@ -80,9 +80,20 @@ public void testRmEmptyRootDirRecursive() throws Throwable {
     skipIfUnsupported(TEST_ROOT_TESTS_ENABLED);
     Path root = new Path("/");
     assertIsDirectory(root);
-    boolean deleted = getFileSystem().delete(root, true);
-    LOG.info("rm -r / of empty dir result is {}", deleted);
-    assertIsDirectory(root);
+    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);
+      LOG.info("rm -r / of empty dir result is {}", deleted);
+      assertIsDirectory(root);
+    }
   }
 
   @Test
@@ -119,9 +130,20 @@ public Void call() throws Exception {
         },
         new LambdaTestUtils.ProportionalRetryInterval(50, 1000));
     // then try to delete the empty one
-    boolean deleted = fs.delete(root, false);
-    LOG.info("rm / of empty dir result is {}", deleted);
-    assertIsDirectory(root);
+    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 = fs.delete(root, false);
+      LOG.info("rm / of empty dir result is {}", deleted);
+      assertIsDirectory(root);
+    }
   }
 
   @Test
@@ -157,13 +179,24 @@ public void testRmRootRecursive() throws Throwable {
     Path file = new Path("/testRmRootRecursive");
     try {
       ContractTestUtils.touch(getFileSystem(), file);
-      boolean deleted = getFileSystem().delete(root, true);
-      assertIsDirectory(root);
-      LOG.info("rm -rf / result is {}", deleted);
-      if (deleted) {
-        assertPathDoesNotExist("expected file to be deleted", file);
+      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 {
-        assertPathExists("expected file to be preserved", file);
+        boolean deleted = getFileSystem().delete(root, true);
+        assertIsDirectory(root);
+        LOG.info("rm -rf / result is {}", deleted);
+        if (deleted) {
+          assertPathDoesNotExist("expected file to be deleted", file);
+        } else {
+          assertPathExists("expected file to be preserved", file);
+        }
       }
     } finally{
       getFileSystem().delete(file, false);

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

@@ -234,6 +234,12 @@ public interface ContractOptions {
    */
   String TEST_ROOT_TESTS_ENABLED = "test.root-tests-enabled";
 
+  /**
+   * Indicates that FS is incompatible with root delete.
+   * {@value}
+   */
+  String ROOT_DELETE_INCOMPATIBLE_FS = "root-delete-incompatible-fs";
+
   /**
    * Limit for #of random seeks to perform.
    * Keep low for remote filesystems for faster tests

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/impl/DeleteOperation.java

@@ -32,6 +32,7 @@
 
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.PathIsNotEmptyDirectoryException;
+import org.apache.hadoop.fs.PathPermissionException;
 import org.apache.hadoop.fs.RemoteIterator;
 import org.apache.hadoop.fs.s3a.Invoker;
 import org.apache.hadoop.fs.s3a.Retries;
@@ -190,7 +191,7 @@ public Boolean execute() throws IOException {
         LOG.error("S3A: Cannot delete the root directory."
                 + " Path: {}. Recursive: {}",
             status.getPath(), recursive);
-        return false;
+        throw new PathPermissionException(path.toString(), "S3A: Cannot delete the root directory");
       }
 
       if (!recursive && status.isEmptyDirectory() == Tristate.FALSE) {

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3a/ITestS3AContractRootDir.java

@@ -18,7 +18,6 @@
 
 package org.apache.hadoop.fs.contract.s3a;
 
-import org.junit.Ignore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,9 +44,4 @@ protected AbstractFSContract createContract(Configuration conf) {
   public S3AFileSystem getFileSystem() {
     return (S3AFileSystem) super.getFileSystem();
   }
-
-  @Override
-  @Ignore("S3 always return false when non-recursively remove root dir")
-  public void testRmNonEmptyRootDirNonRecursive() throws Throwable {
-  }
 }