HADOOP-17060. listStatus and getFileStatus behave inconsistent in the case of ViewFs implementation for isDirectory

Author: umamaheswararao

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileStatus.java

@@ -170,12 +170,6 @@ public FileStatus(long length, boolean isdir, int block_replication,
     this.symlink = symlink;
     this.path = path;
     this.attr = attr;
-
-    // The variables isdir and symlink indicate the type:
-    // 1. isdir implies directory, in which case symlink must be null.
-    // 2. !isdir implies a file or symlink, symlink != null implies a
-    //    symlink, otherwise it's a file.
-    assert (isdir && symlink == null) || !isdir;
   }
 
   /**

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java

@@ -1202,19 +1202,18 @@ public FileStatus[] listStatus(Path f) throws AccessControlException,
           INodeLink<FileSystem> link = (INodeLink<FileSystem>) inode;
           try {
             String linkedPath = link.getTargetFileSystem().getUri().getPath();
-            if("".equals(linkedPath)) {
+            if ("".equals(linkedPath)) {
               linkedPath = "/";
             }
             FileStatus status =
-                ((ChRootedFileSystem)link.getTargetFileSystem())
-                .getMyFs().getFileStatus(new Path(linkedPath));
-            result[i++] = new FileStatus(status.getLen(), false,
-              status.getReplication(), status.getBlockSize(),
-              status.getModificationTime(), status.getAccessTime(),
-              status.getPermission(), status.getOwner(), status.getGroup(),
-              link.getTargetLink(),
-              new Path(inode.fullPath).makeQualified(
-                  myUri, null));
+                ((ChRootedFileSystem) link.getTargetFileSystem()).getMyFs()
+                    .getFileStatus(new Path(linkedPath));
+            result[i++] = new FileStatus(status.getLen(), status.isDirectory(),
+                status.getReplication(), status.getBlockSize(),
+                status.getModificationTime(), status.getAccessTime(),
+                status.getPermission(), status.getOwner(), status.getGroup(),
+                link.getTargetLink(),
+                new Path(inode.fullPath).makeQualified(myUri, null));
           } catch (FileNotFoundException ex) {
             result[i++] = new FileStatus(0, false, 0, 0,
               creationTime, creationTime, PERMISSION_555,

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFs.java

@@ -992,15 +992,17 @@ public FileStatus[] listStatus(final Path f) throws AccessControlException,
 
           try {
             String linkedPath = link.getTargetFileSystem().getUri().getPath();
-            FileStatus status = ((ChRootedFs)link.getTargetFileSystem())
+            if ("".equals(linkedPath)) {
+              linkedPath = "/";
+            }
+            FileStatus status = ((ChRootedFs) link.getTargetFileSystem())
                 .getMyFs().getFileStatus(new Path(linkedPath));
-            result[i++] = new FileStatus(status.getLen(), false,
-              status.getReplication(), status.getBlockSize(),
-              status.getModificationTime(), status.getAccessTime(),
-              status.getPermission(), status.getOwner(), status.getGroup(),
-              link.getTargetLink(),
-              new Path(inode.fullPath).makeQualified(
-                  myUri, null));
+            result[i++] = new FileStatus(status.getLen(), status.isDirectory(),
+                status.getReplication(), status.getBlockSize(),
+                status.getModificationTime(), status.getAccessTime(),
+                status.getPermission(), status.getOwner(), status.getGroup(),
+                link.getTargetLink(),
+                new Path(inode.fullPath).makeQualified(myUri, null));
           } catch (FileNotFoundException ex) {
             result[i++] = new FileStatus(0, false, 0, 0,
               creationTime, creationTime, PERMISSION_555,

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFsBaseTest.java

@@ -486,6 +486,9 @@ public void testListOnInternalDirsOfMountTable() throws IOException {
     fs = fileContextTestHelper.containsPath(fcView, "/user", dirPaths);
       Assert.assertNotNull(fs);
       Assert.assertTrue("A mount should appear as symlink", fs.isSymlink());
+      Assert.assertTrue(
+          "A mount link should appear as directory if target is directory",
+          fs.isDirectory());
     fs = fileContextTestHelper.containsPath(fcView, "/data", dirPaths);
       Assert.assertNotNull(fs);
       Assert.assertTrue("A mount should appear as symlink", fs.isSymlink());
@@ -498,7 +501,9 @@ public void testListOnInternalDirsOfMountTable() throws IOException {
     fs = fileContextTestHelper.containsPath(fcView, "/linkToAFile", dirPaths);
       Assert.assertNotNull(fs);
       Assert.assertTrue("A mount should appear as symlink", fs.isSymlink());
-      
+      Assert.assertFalse(
+          "A mount should appear as non dir if target link is a file",
+          fs.isDirectory());
 
 
       // list on internal dir