瀏覽代碼

HADOOP-18385. ITestS3ACannedACLs failure; fixed by adding in a span (#4736)

Contributed by Ashutosh Gupta
Ashutosh Gupta 2 年之前
父節點
當前提交
d09dd4a0b9
共有 1 個文件被更改,包括 12 次插入9 次删除
  1. 12 9
      hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ACannedACLs.java

+ 12 - 9
hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ACannedACLs.java

@@ -35,6 +35,7 @@ import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.contract.ContractTestUtils;
 import org.apache.hadoop.fs.s3a.audit.S3AAuditConstants;
 import org.apache.hadoop.fs.s3a.impl.StoreContext;
+import org.apache.hadoop.fs.store.audit.AuditSpan;
 
 import static org.apache.hadoop.fs.s3a.Constants.CANNED_ACL;
 import static org.apache.hadoop.fs.s3a.S3ATestUtils.removeBaseAndBucketOverrides;
@@ -64,15 +65,17 @@ public class ITestS3ACannedACLs extends AbstractS3ATestBase {
   @Test
   public void testCreatedObjectsHaveACLs() throws Throwable {
     S3AFileSystem fs = getFileSystem();
-    Path dir = methodPath();
-    fs.mkdirs(dir);
-    assertObjectHasLoggingGrant(dir, false);
-    Path path = new Path(dir, "1");
-    ContractTestUtils.touch(fs, path);
-    assertObjectHasLoggingGrant(path, true);
-    Path path2 = new Path(dir, "2");
-    fs.rename(path, path2);
-    assertObjectHasLoggingGrant(path2, true);
+    try (AuditSpan span = span()) {
+      Path dir = methodPath();
+      fs.mkdirs(dir);
+      assertObjectHasLoggingGrant(dir, false);
+      Path path = new Path(dir, "1");
+      ContractTestUtils.touch(fs, path);
+      assertObjectHasLoggingGrant(path, true);
+      Path path2 = new Path(dir, "2");
+      fs.rename(path, path2);
+      assertObjectHasLoggingGrant(path2, true);
+    }
   }
 
   /**