HDDS-4211. [OFS] Better owner and group display for listing Ozone volumes and buckets

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java

@@ -623,6 +623,11 @@ private void teardownVolumeBucketWithDir(Path bucketPath1)
    */
   @Test
   public void testListStatusRootAndVolumeNonRecursive() throws Exception {
+    // Get owner and group of the user running this test
+    final UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
+    final String ownerShort = ugi.getShortUserName();
+    final String group = ugi.getPrimaryGroupName();
+
     Path bucketPath1 = createRandomVolumeBucketWithDirs();
     Path bucketPath2 = createRandomVolumeBucketWithDirs();
     // listStatus("/volume/bucket")
@@ -633,11 +638,17 @@ public void testListStatusRootAndVolumeNonRecursive() throws Exception {
         OZONE_URI_DELIMITER + new OFSPath(bucketPath1).getVolumeName());
     FileStatus[] fileStatusVolume = ofs.listStatus(volume);
     Assert.assertEquals(1, fileStatusVolume.length);
+    Assert.assertEquals(ownerShort, fileStatusVolume[0].getOwner());
+    Assert.assertEquals(group, fileStatusVolume[0].getGroup());
     // listStatus("/")
     Path root = new Path(OZONE_URI_DELIMITER);
     FileStatus[] fileStatusRoot = ofs.listStatus(root);
     // Default volume "s3v" is created by OM during start up.
     Assert.assertEquals(2 + 1, fileStatusRoot.length);
+    for (FileStatus fileStatus : fileStatusRoot) {
+      Assert.assertEquals(ownerShort, fileStatus.getOwner());
+      Assert.assertEquals(group, fileStatus.getGroup());
+    }
     // Cleanup
     teardownVolumeBucketWithDir(bucketPath2);
     teardownVolumeBucketWithDir(bucketPath1);

hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java

@@ -663,12 +663,16 @@ private List<FileStatusAdapter> listStatusVolume(String volumeStr,
     OFSPath ofsStartPath = new OFSPath(startPath);
     // list buckets in the volume
     OzoneVolume volume = objectStore.getVolume(volumeStr);
+    UserGroupInformation ugi =
+        UserGroupInformation.createRemoteUser(volume.getOwner());
+    String owner = ugi.getShortUserName();
+    String group = getGroupName(ugi);
     Iterator<? extends OzoneBucket> iter =
         volume.listBuckets(null, ofsStartPath.getBucketName());
     List<FileStatusAdapter> res = new ArrayList<>();
     while (iter.hasNext() && res.size() < numEntries) {
       OzoneBucket bucket = iter.next();
-      res.add(getFileStatusAdapterForBucket(bucket, uri, username));
+      res.add(getFileStatusAdapterForBucket(bucket, uri, owner, group));
       if (recursive) {
         String pathStrNext = volumeStr + OZONE_URI_DELIMITER + bucket.getName();
         res.addAll(listStatus(pathStrNext, recursive, startPath,
@@ -944,6 +948,19 @@ private BlockLocation[] getBlockLocations(OzoneFileStatus fileStatus) {
     return blockLocations;
   }
 
+  /**
+   * Helper function to get the primary group name from a UGI.
+   * @param ugi UserGroupInformation
+   * @return String of the primary group name, empty String on exception.
+   */
+  private static String getGroupName(UserGroupInformation ugi) {
+    try {
+      return ugi.getPrimaryGroupName();
+    } catch (IOException ignored) {
+      return "";
+    }
+  }
+
   /**
    * Generate a FileStatusAdapter for a volume.
    * @param ozoneVolume OzoneVolume object
@@ -959,11 +976,14 @@ private static FileStatusAdapter getFileStatusAdapterForVolume(
           ozoneVolume.getName(), pathStr);
     }
     Path path = new Path(pathStr);
+    UserGroupInformation ugi =
+        UserGroupInformation.createRemoteUser(ozoneVolume.getOwner());
+    String owner = ugi.getShortUserName();
+    String group = getGroupName(ugi);
     return new FileStatusAdapter(0L, path, true, (short)0, 0L,
         ozoneVolume.getCreationTime().getEpochSecond() * 1000, 0L,
         FsPermission.getDirDefault().toShort(),
-        // TODO: Revisit owner and admin
-        ozoneVolume.getOwner(), ozoneVolume.getAdmin(), path,
+        owner, group, path,
         new BlockLocation[0]
     );
   }
@@ -972,24 +992,25 @@ private static FileStatusAdapter getFileStatusAdapterForVolume(
    * Generate a FileStatusAdapter for a bucket.
    * @param ozoneBucket OzoneBucket object.
    * @param uri Full URI to OFS root.
+   * @param owner Owner of the parent volume of the bucket.
+   * @param group Group of the parent volume of the bucket.
    * @return FileStatusAdapter for a bucket.
    */
   private static FileStatusAdapter getFileStatusAdapterForBucket(
-      OzoneBucket ozoneBucket, URI uri, String username) {
+      OzoneBucket ozoneBucket, URI uri, String owner, String group) {
     String pathStr = uri.toString() +
         OZONE_URI_DELIMITER + ozoneBucket.getVolumeName() +
         OZONE_URI_DELIMITER + ozoneBucket.getName();
     if (LOG.isDebugEnabled()) {
-      LOG.debug("getFileStatusAdapterForBucket: ozoneBucket={}, pathStr={}, "
-              + "username={}", ozoneBucket.getVolumeName() + OZONE_URI_DELIMITER
-              + ozoneBucket.getName(), pathStr, username);
+      LOG.debug("getFileStatusAdapterForBucket: ozoneBucket={}, pathStr={}",
+          ozoneBucket.getVolumeName() + OZONE_URI_DELIMITER +
+              ozoneBucket.getName(), pathStr);
     }
     Path path = new Path(pathStr);
     return new FileStatusAdapter(0L, path, true, (short)0, 0L,
         ozoneBucket.getCreationTime().getEpochSecond() * 1000, 0L,
-        FsPermission.getDirDefault().toShort(),  // TODO: derive from ACLs later
-        // TODO: revisit owner and group
-        username, username, path, new BlockLocation[0]);
+        FsPermission.getDirDefault().toShort(),
+        owner, group, path, new BlockLocation[0]);
   }
 
   /**