From 79e56338679d853ffb9875d3aa80d49da93e634b Mon Sep 17 00:00:00 2001
From: Weiwei Yang <wwei@apache.org>
Date: Sun, 8 Mar 2020 21:01:34 -0700
Subject: [PATCH] HADOOP-16840. AliyunOSS: getFileStatus throws
 FileNotFoundException in versioning bucket. Contributed by wujinhu.

(cherry picked from commit 6dfe00c71eb3721e9be3fc42349a81c4b013ada1)
---
 .../fs/aliyun/oss/AliyunOSSFileSystem.java    | 18 ++++++++++-----
 .../oss/TestAliyunOSSFileSystemContract.java  | 23 +++++++++++++++++++
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystem.java b/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystem.java
index ad359c6c609..3f8728983a8 100644
--- a/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystem.java
+++ b/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystem.java
@@ -273,12 +273,18 @@ public class AliyunOSSFileSystem extends FileSystem {
     }
     if (meta == null) {
       ObjectListing listing = store.listObjects(key, 1, null, false);
-      if (CollectionUtils.isNotEmpty(listing.getObjectSummaries()) ||
-          CollectionUtils.isNotEmpty(listing.getCommonPrefixes())) {
-        return new OSSFileStatus(0, true, 1, 0, 0, qualifiedPath, username);
-      } else {
-        throw new FileNotFoundException(path + ": No such file or directory!");
-      }
+      do {
+        if (CollectionUtils.isNotEmpty(listing.getObjectSummaries()) ||
+            CollectionUtils.isNotEmpty(listing.getCommonPrefixes())) {
+          return new OSSFileStatus(0, true, 1, 0, 0, qualifiedPath, username);
+        } else if (listing.isTruncated()) {
+          listing = store.listObjects(key, 1000, listing.getNextMarker(),
+              false);
+        } else {
+          throw new FileNotFoundException(
+              path + ": No such file or directory!");
+        }
+      } while (true);
     } else if (objectRepresentsDirectory(key, meta.getContentLength())) {
       return new OSSFileStatus(0, true, 1, 0, meta.getLastModified().getTime(),
           qualifiedPath, username);
diff --git a/hadoop-tools/hadoop-aliyun/src/test/java/org/apache/hadoop/fs/aliyun/oss/TestAliyunOSSFileSystemContract.java b/hadoop-tools/hadoop-aliyun/src/test/java/org/apache/hadoop/fs/aliyun/oss/TestAliyunOSSFileSystemContract.java
index a83c6dac0ca..e6467f49f49 100644
--- a/hadoop-tools/hadoop-aliyun/src/test/java/org/apache/hadoop/fs/aliyun/oss/TestAliyunOSSFileSystemContract.java
+++ b/hadoop-tools/hadoop-aliyun/src/test/java/org/apache/hadoop/fs/aliyun/oss/TestAliyunOSSFileSystemContract.java
@@ -31,6 +31,7 @@ import org.junit.Test;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.Arrays;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -96,6 +97,28 @@ public class TestAliyunOSSFileSystemContract
         UserGroupInformation.getCurrentUser().getShortUserName());
   }
 
+  @Test
+  public void testGetFileStatusInVersioningBucket() throws Exception {
+    Path file = this.path("/test/hadoop/file");
+    for (int i = 1; i <= 30; ++i) {
+      this.createFile(new Path(file, "sub" + i));
+    }
+    assertTrue("File exists", this.fs.exists(file));
+    FileStatus fs = this.fs.getFileStatus(file);
+    assertEquals(fs.getOwner(),
+        UserGroupInformation.getCurrentUser().getShortUserName());
+    assertEquals(fs.getGroup(),
+        UserGroupInformation.getCurrentUser().getShortUserName());
+
+    AliyunOSSFileSystemStore store = ((AliyunOSSFileSystem)this.fs).getStore();
+    for (int i = 0; i < 29; ++i) {
+      store.deleteObjects(Arrays.asList("test/hadoop/file/sub" + i));
+    }
+
+    // HADOOP-16840, will throw FileNotFoundException without this fix
+    this.fs.getFileStatus(file);
+  }
+
   @Test
   public void testDeleteSubdir() throws IOException {
     Path parentDir = this.path("/test/hadoop");