From 9638c3fe671e838d011af5431263c4650fbbe9d6 Mon Sep 17 00:00:00 2001
From: Wei Yan <weiy@apache.org>
Date: Thu, 5 Apr 2018 12:00:52 -0700
Subject: [PATCH] HDFS-13353. RBF: TestRouterWebHDFSContractCreate failed.
 Contributed by Takanobu Asanuma.

(cherry picked from commit 3121e8c29361cb560df29188e1cd1061a5fc34c4)
---
 .../fs/contract/AbstractContractCreateTest.java      | 12 ++++++------
 .../src/test/resources/contract/webhdfs.xml          |  5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractCreateTest.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractCreateTest.java
index 2053f50b6bc..07c99e0b6a5 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractCreateTest.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractCreateTest.java
@@ -244,12 +244,12 @@ public abstract class AbstractContractCreateTest extends
       out.write('a');
       out.flush();
       if (!fs.exists(path)) {
-
-        if (isSupported(IS_BLOBSTORE)) {
-          // object store: downgrade to a skip so that the failure is visible
-          // in test results
-          skip("Filesystem is an object store and newly created files are not "
-              + "immediately visible");
+        if (isSupported(IS_BLOBSTORE) ||
+            isSupported(CREATE_VISIBILITY_DELAYED)) {
+          // object store or some file systems: downgrade to a skip so that the
+          // failure is visible in test results
+          skip("For object store or some file systems, newly created files are"
+              + " not immediately visible");
         }
         assertPathExists("expected path to be visible before file closed",
             path);
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/resources/contract/webhdfs.xml b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/resources/contract/webhdfs.xml
index f9b7d9435d2..0cb6dd8a6d0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/resources/contract/webhdfs.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/resources/contract/webhdfs.xml
@@ -23,4 +23,9 @@
     <value>false</value>
   </property>
 
+  <property>
+    <name>fs.contract.create-visibility-delayed</name>
+    <value>true</value>
+  </property>
+
 </configuration>