From 02546e36a658e96f679a252c2ece0bf3b3ec2e1c Mon Sep 17 00:00:00 2001
From: Valerij Fredriksen <valerijf@yahooinc.com>
Date: Fri, 4 Aug 2023 14:41:01 +0200
Subject: Add device major & minor to FileAttributes

---
 .../hosted/node/admin/cgroup/IoController.java     |  3 --
 .../node/admin/task/util/file/FileAttributes.java  | 38 ++++++----------------
 2 files changed, 10 insertions(+), 31 deletions(-)

(limited to 'node-admin/src/main/java/com')

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/cgroup/IoController.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/cgroup/IoController.java
index d3b8c445520..5bbdd5c3b70 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/cgroup/IoController.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/cgroup/IoController.java
@@ -37,9 +37,6 @@ public class IoController {
             String[] parts = device.split(":");
             return new Device(parseInt(parts[0]), parseInt(parts[1]));
         }
-        public static Device fromDeviceNumber(int deviceNumber) {
-            return new Device(deviceNumber >>> 8, deviceNumber & 0xFF);
-        }
 
         @Override
         public int compareTo(Device o) {
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileAttributes.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileAttributes.java
index 332b4e61dc1..c638fe98cdf 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileAttributes.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileAttributes.java
@@ -13,36 +13,13 @@ import java.util.Set;
  *
  * @author hakonhall
  */
-public class FileAttributes {
-
-    private final Instant lastModifiedTime;
-    private final int ownerId;
-    private final int groupId;
-    private final String permissions;
-    private final boolean isRegularFile;
-    private final boolean isDirectory;
-    private final long size;
-
-    public FileAttributes(Instant lastModifiedTime, int ownerId, int groupId, String permissions, boolean isRegularFile, boolean isDirectory, long size) {
-        this.lastModifiedTime = lastModifiedTime;
-        this.ownerId = ownerId;
-        this.groupId = groupId;
-        this.permissions = permissions;
-        this.isRegularFile = isRegularFile;
-        this.isDirectory = isDirectory;
-        this.size = size;
-    }
-
-    public Instant lastModifiedTime() { return lastModifiedTime; }
-    public int ownerId() { return ownerId; }
-    public int groupId() { return groupId; }
-    public String permissions() { return permissions; }
-    public boolean isRegularFile() { return isRegularFile; }
-    public boolean isDirectory() { return isDirectory; }
-    public long size() { return size; }
+public record FileAttributes(Instant lastModifiedTime, int ownerId, int groupId, String permissions,
+                             boolean isRegularFile, boolean isDirectory, long size, int deviceMajor, int deviceMinor) {
 
     @SuppressWarnings("unchecked")
     static FileAttributes fromAttributes(Map<String, Object> attributes) {
+        long dev_t = (long) attributes.get("dev");
+
         return new FileAttributes(
                 ((FileTime) attributes.get("lastModifiedTime")).toInstant(),
                 (int) attributes.get("uid"),
@@ -50,6 +27,11 @@ public class FileAttributes {
                 PosixFilePermissions.toString(((Set<PosixFilePermission>) attributes.get("permissions"))),
                 (boolean) attributes.get("isRegularFile"),
                 (boolean) attributes.get("isDirectory"),
-                (long) attributes.get("size"));
+                (long) attributes.get("size"),
+                deviceMajor(dev_t), deviceMinor(dev_t));
     }
+
+    // Encoded as MMMM Mmmm mmmM MMmm, where M is a hex digit of the major number and m is a hex digit of the minor number.
+    static int deviceMajor(long dev_t) { return (int) (((dev_t & 0xFFFFF00000000000L) >> 32) | ((dev_t & 0xFFF00) >> 8)); }
+    static int deviceMinor(long dev_t) { return (int) (((dev_t & 0x00000FFFFFF00000L) >> 12) |  (dev_t & 0x000FF)); }
 }
-- 
cgit v1.2.3