Add device major & minor to FileAttributes

5 files changed, 37 insertions, 41 deletions

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)); }
 }
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/cgroup/IoControllerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/cgroup/IoControllerTest.java
index d2a4ebbfbbd..71a05eb4571 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/cgroup/IoControllerTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/cgroup/IoControllerTest.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.hosted.node.admin.cgroup;
 
 import org.junit.jupiter.api.Test;
 
-import static com.yahoo.vespa.hosted.node.admin.cgroup.IoController.Device;
 import static com.yahoo.vespa.hosted.node.admin.cgroup.IoController.Max;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -13,12 +12,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 class IoControllerTest {
 
     @Test
-    void device_number_parsing() {
-        assertEquals(new Device(253, 15), Device.fromDeviceNumber(253 * 256 + 15));
-        assertEquals(new Device(345, 123), Device.fromDeviceNumber(345 * 256 + 123));
-    }
-
-    @Test
     void parse_io_max() {
         assertEquals(Max.UNLIMITED, Max.fromString(""));
         assertEquals(new Max(Size.from(1), Size.max(), Size.max(), Size.max()), Max.fromString("rbps=1 wiops=max"));
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileAttributesCacheTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileAttributesCacheTest.java
index 8c9188a9409..1b68d1d10a3 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileAttributesCacheTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileAttributesCacheTest.java
@@ -3,9 +3,12 @@ package com.yahoo.vespa.hosted.node.admin.task.util.file;
 
 import org.junit.jupiter.api.Test;
 
+import java.time.Instant;
 import java.util.Optional;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -23,7 +26,8 @@ public class FileAttributesCacheTest {
         verify(unixPath, times(1)).getAttributesIfExists();
         verifyNoMoreInteractions(unixPath);
 
-        FileAttributes attributes = mock(FileAttributes.class);
+        FileAttributes attributes = new FileAttributes(Instant.EPOCH, 0, 0, "", false, false, 0, 0, 0);
+        when(unixPath.getAttributesIfExists()).thenReturn(Optional.of(attributes));
         when(unixPath.getAttributesIfExists()).thenReturn(Optional.of(attributes));
         assertTrue(cache.get().isPresent());
         verify(unixPath, times(1 + 1)).getAttributesIfExists();
@@ -32,4 +36,4 @@ public class FileAttributesCacheTest {
         assertEquals(attributes, cache.getOrThrow());
         verifyNoMoreInteractions(unixPath);
     }
-}
\ No newline at end of file
+}
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileAttributesTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileAttributesTest.java
new file mode 100644
index 00000000000..ddcd225a871
--- /dev/null
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileAttributesTest.java
@@ -0,0 +1,20 @@
+// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.hosted.node.admin.task.util.file;
+
+import org.junit.jupiter.api.Test;
+
+import static com.yahoo.vespa.hosted.node.admin.task.util.file.FileAttributes.deviceMajor;
+import static com.yahoo.vespa.hosted.node.admin.task.util.file.FileAttributes.deviceMinor;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * @author freva
+ */
+class FileAttributesTest {
+
+    @Test
+    void parse_dev_t() {
+        assertEquals(0x12345BCD, deviceMajor(0x1234567890ABCDEFL));
+        assertEquals(0x67890AEF, deviceMinor(0x1234567890ABCDEFL));
+    }
+}