You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by li...@apache.org on 2016/12/13 21:48:17 UTC

hadoop git commit: HADOOP-13886. s3guard: ITestS3AFileOperationCost.testFakeDirectoryDeletion failure. Contributed by Mingliang Liu

Repository: hadoop
Updated Branches:
  refs/heads/HADOOP-13345 49965d2d6 -> b2c4f8cfe


HADOOP-13886. s3guard: ITestS3AFileOperationCost.testFakeDirectoryDeletion failure. Contributed by Mingliang Liu


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b2c4f8cf
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b2c4f8cf
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b2c4f8cf

Branch: refs/heads/HADOOP-13345
Commit: b2c4f8cfe181d050e54ac29c08d5c0ac888dd4d0
Parents: 49965d2
Author: Mingliang Liu <li...@apache.org>
Authored: Mon Dec 12 11:58:11 2016 -0800
Committer: Mingliang Liu <li...@apache.org>
Committed: Tue Dec 13 13:45:32 2016 -0800

----------------------------------------------------------------------
 .../org/apache/hadoop/fs/s3a/ITestS3AFileOperationCost.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/b2c4f8cf/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AFileOperationCost.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AFileOperationCost.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AFileOperationCost.java
index 3e2d2b0..98184e4 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AFileOperationCost.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AFileOperationCost.java
@@ -33,8 +33,8 @@ import java.net.URI;
 import static org.apache.hadoop.fs.contract.ContractTestUtils.*;
 import static org.apache.hadoop.fs.s3a.Statistic.*;
 import static org.apache.hadoop.fs.s3a.S3ATestUtils.*;
-import static org.apache.hadoop.fs.s3a.S3ATestUtils.MetricDiff;
 import static org.apache.hadoop.test.GenericTestUtils.getTestDir;
+import static org.junit.Assume.assumeFalse;
 
 /**
  * Use metrics to assert about the cost of file status queries.
@@ -195,6 +195,13 @@ public class ITestS3AFileOperationCost extends AbstractS3ATestBase {
         + "In S3, rename deletes any fake directories as a part of "
         + "clean up activity");
     S3AFileSystem fs = getFileSystem();
+
+    // As this test uses the s3 metrics to count the number of fake directory
+    // operations, it depends on side effects happening internally. With
+    // metadata store enabled, it is brittle to change. We disable this test
+    // before the internal behavior w/ or w/o metadata store.
+    assumeFalse(fs.isMetadataStoreConfigured());
+
     Path srcBaseDir = path("src");
     mkdirs(srcBaseDir);
     MetricDiff deleteRequests =


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org