Merge branch 'master' into 2ugw

JordanKeo45 · JordanKeo45 · commit decc8a644aa5 · 2026-03-02T10:28:34.000-04:00
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
@@ -75,6 +75,8 @@ jobs:
       - sign
       - update_repositories
     runs-on: buildinator-5
+    permissions:
+      contents: write
     steps:
       - name: Set Variables
         if: startsWith(github.ref, 'refs/tags/')
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,3 @@
-## 45drives-tools 4.0.32-1
+## 45drives-tools 4.0.38-2
 
-* Hotfix - reverses hl4 slot order
+* Rebuilding with added github write perms
diff --git a/dalias/example_config/STUDIO15 b/dalias/example_config/STUDIO15
@@ -0,0 +1,15 @@
+1-1
+1-2
+1-3
+1-4
+1-5
+1-6
+1-7
+1-8
+1-9
+1-10
+1-11
+1-12
+1-13
+1-14
+1-15
diff --git a/manifest.json b/manifest.json
@@ -3,8 +3,8 @@
     "name": "45drives-tools",
     "title": "45drives-tools",
     "description": "cli tools for 45Drives server products",
-    "version": "4.0.32",
-    "build_number": "1",
+    "version": "4.0.38",
+    "build_number": "2",
     "stable": true,
     "author": "Brett Kelly <bkelly@45drives.com>",
     "git_url": "https://github.com/45Drives/ceph-ansible-45d",
@@ -75,8 +75,8 @@
     ],
     "changelog": {
         "urgency": "medium",
-        "version": "4.0.32",
-        "build_number": "1",
+        "version": "4.0.38",
+        "build_number": "2",
         "date": null,
         "packager": "Brett Kelly <bkelly@45drives.com>",
         "changes": []
diff --git a/packaging/debian-bookworm/changelog b/packaging/debian-bookworm/changelog
@@ -1,3 +1,55 @@
+45drives-tools (4.0.38-2bookworm) bookworm; urgency=medium
+
+  * Rebuilding with added github write perms
+
+ -- Jordan Keough <jkeough@45drives.com>  Fri, 27 Feb 2026 09:12:36 -0400
+
+45drives-tools (4.0.38-1bookworm) bookworm; urgency=medium
+
+  * Adds Studio15
+
+ -- Jordan Keough <jkeough@45drives.com>  Fri, 27 Feb 2026 08:17:24 -0400
+
+45drives-tools (4.0.37-1bookworm) bookworm; urgency=medium
+
+  * Removes lines preventing dmap from working on HL15
+
+ -- Jordan Keough <jkeough@45drives.com>  Wed, 28 Jan 2026 10:00:53 -0400
+
+45drives-tools (4.0.36-2bookworm) bookworm; urgency=medium
+
+  * Missed a commit in last merge, now has full fix for virtual nvme block devices
+    (ubu20)
+
+ -- Jordan Keough <jkeough@45drives.com>  Thu, 22 Jan 2026 06:06:59 -0400
+
+45drives-tools (4.0.36-1bookworm) bookworm; urgency=medium
+
+  * Merges nvme drive mapping and loadtest fixes to handle custom nvme aliasing paths
+    as seen on ubu20 systems
+
+ -- Jordan Keough <jkeough@45drives.com>  Thu, 22 Jan 2026 05:31:52 -0400
+
+45drives-tools (4.0.35-1bookworm) bookworm; urgency=medium
+
+  * Updates loadtest to properly detect non-standard custom nvme aliasing paths (as
+    seen on ubu20 systems)
+
+ -- Jordan Keough <jkeough@45drives.com>  Fri, 09 Jan 2026 05:45:27 -0400
+
+45drives-tools (4.0.34-1bookworm) bookworm; urgency=medium
+
+  * Fixes nvme drive mapping on ubuntu 20
+
+ -- Jordan Keough <jkeough@45drives.com>  Thu, 08 Jan 2026 10:23:38 -0400
+
+45drives-tools (4.0.33-1bookworm) bookworm; urgency=medium
+
+  * Updates ubm udev trigger logic to run when 'change' actions trigger in addition
+    to 'add' actions
+
+ -- Jordan Keough <jkeough@45drives.com>  Mon, 05 Jan 2026 08:47:20 -0400
+
 45drives-tools (4.0.32-1bookworm) bookworm; urgency=medium
 
   * Hotfix - reverses hl4 slot order
diff --git a/packaging/rocky-el8/main.spec.j2 b/packaging/rocky-el8/main.spec.j2
@@ -77,6 +77,26 @@ fi
 /usr/lib/udev/rules.d/*
 
 %changelog
+* Fri Feb 27 2026 Jordan Keough <jkeough@45drives.com> 4.0.38-2
+- Rebuilding with added github write perms
+* Fri Feb 27 2026 Jordan Keough <jkeough@45drives.com> 4.0.38-1
+- Adds Studio15
+* Wed Jan 28 2026 Jordan Keough <jkeough@45drives.com> 4.0.37-1
+- Removes lines preventing dmap from working on HL15
+* Thu Jan 22 2026 Jordan Keough <jkeough@45drives.com> 4.0.36-2
+- Missed a commit in last merge, now has full fix for virtual nvme block devices
+  (ubu20)
+* Thu Jan 22 2026 Jordan Keough <jkeough@45drives.com> 4.0.36-1
+- Merges nvme drive mapping and loadtest fixes to handle custom nvme aliasing paths
+  as seen on ubu20 systems
+* Fri Jan 09 2026 Jordan Keough <jkeough@45drives.com> 4.0.35-1
+- Updates loadtest to properly detect non-standard custom nvme aliasing paths (as
+  seen on ubu20 systems)
+* Thu Jan 08 2026 Jordan Keough <jkeough@45drives.com> 4.0.34-1
+- Fixes nvme drive mapping on ubuntu 20
+* Mon Jan 05 2026 Jordan Keough <jkeough@45drives.com> 4.0.33-1
+- Updates ubm udev trigger logic to run when 'change' actions trigger in addition
+  to 'add' actions
 * Fri Dec 19 2025 Jordan Keough <jkeough@45drives.com> 4.0.32-1
 - Hotfix - reverses hl4 slot order
 * Wed Dec 17 2025 Jordan Keough <jkeough@45drives.com> 4.0.31-1
diff --git a/packaging/rocky-el9/main.spec.j2 b/packaging/rocky-el9/main.spec.j2
@@ -77,6 +77,26 @@ fi
 /usr/lib/udev/rules.d/*
 
 %changelog
+* Fri Feb 27 2026 Jordan Keough <jkeough@45drives.com> 4.0.38-2
+- Rebuilding with added github write perms
+* Fri Feb 27 2026 Jordan Keough <jkeough@45drives.com> 4.0.38-1
+- Adds Studio15
+* Wed Jan 28 2026 Jordan Keough <jkeough@45drives.com> 4.0.37-1
+- Removes lines preventing dmap from working on HL15
+* Thu Jan 22 2026 Jordan Keough <jkeough@45drives.com> 4.0.36-2
+- Missed a commit in last merge, now has full fix for virtual nvme block devices
+  (ubu20)
+* Thu Jan 22 2026 Jordan Keough <jkeough@45drives.com> 4.0.36-1
+- Merges nvme drive mapping and loadtest fixes to handle custom nvme aliasing paths
+  as seen on ubu20 systems
+* Fri Jan 09 2026 Jordan Keough <jkeough@45drives.com> 4.0.35-1
+- Updates loadtest to properly detect non-standard custom nvme aliasing paths (as
+  seen on ubu20 systems)
+* Thu Jan 08 2026 Jordan Keough <jkeough@45drives.com> 4.0.34-1
+- Fixes nvme drive mapping on ubuntu 20
+* Mon Jan 05 2026 Jordan Keough <jkeough@45drives.com> 4.0.33-1
+- Updates ubm udev trigger logic to run when 'change' actions trigger in addition
+  to 'add' actions
 * Fri Dec 19 2025 Jordan Keough <jkeough@45drives.com> 4.0.32-1
 - Hotfix - reverses hl4 slot order
 * Wed Dec 17 2025 Jordan Keough <jkeough@45drives.com> 4.0.31-1
diff --git a/packaging/ubuntu-focal/changelog b/packaging/ubuntu-focal/changelog
@@ -1,3 +1,55 @@
+45drives-tools (4.0.38-2focal) focal; urgency=medium
+
+  * Rebuilding with added github write perms
+
+ -- Jordan Keough <jkeough@45drives.com>  Fri, 27 Feb 2026 09:12:36 -0400
+
+45drives-tools (4.0.38-1focal) focal; urgency=medium
+
+  * Adds Studio15
+
+ -- Jordan Keough <jkeough@45drives.com>  Fri, 27 Feb 2026 08:17:24 -0400
+
+45drives-tools (4.0.37-1focal) focal; urgency=medium
+
+  * Removes lines preventing dmap from working on HL15
+
+ -- Jordan Keough <jkeough@45drives.com>  Wed, 28 Jan 2026 10:00:53 -0400
+
+45drives-tools (4.0.36-2focal) focal; urgency=medium
+
+  * Missed a commit in last merge, now has full fix for virtual nvme block devices
+    (ubu20)
+
+ -- Jordan Keough <jkeough@45drives.com>  Thu, 22 Jan 2026 06:06:59 -0400
+
+45drives-tools (4.0.36-1focal) focal; urgency=medium
+
+  * Merges nvme drive mapping and loadtest fixes to handle custom nvme aliasing paths
+    as seen on ubu20 systems
+
+ -- Jordan Keough <jkeough@45drives.com>  Thu, 22 Jan 2026 05:31:52 -0400
+
+45drives-tools (4.0.35-1focal) focal; urgency=medium
+
+  * Updates loadtest to properly detect non-standard custom nvme aliasing paths (as
+    seen on ubu20 systems)
+
+ -- Jordan Keough <jkeough@45drives.com>  Fri, 09 Jan 2026 05:45:27 -0400
+
+45drives-tools (4.0.34-1focal) focal; urgency=medium
+
+  * Fixes nvme drive mapping on ubuntu 20
+
+ -- Jordan Keough <jkeough@45drives.com>  Thu, 08 Jan 2026 10:23:38 -0400
+
+45drives-tools (4.0.33-1focal) focal; urgency=medium
+
+  * Updates ubm udev trigger logic to run when 'change' actions trigger in addition
+    to 'add' actions
+
+ -- Jordan Keough <jkeough@45drives.com>  Mon, 05 Jan 2026 08:47:20 -0400
+
 45drives-tools (4.0.32-1focal) focal; urgency=medium
 
   * Hotfix - reverses hl4 slot order
diff --git a/packaging/ubuntu-jammy/changelog b/packaging/ubuntu-jammy/changelog
@@ -1,3 +1,55 @@
+45drives-tools (4.0.38-2jammy) jammy; urgency=medium
+
+  * Rebuilding with added github write perms
+
+ -- Jordan Keough <jkeough@45drives.com>  Fri, 27 Feb 2026 09:12:36 -0400
+
+45drives-tools (4.0.38-1jammy) jammy; urgency=medium
+
+  * Adds Studio15
+
+ -- Jordan Keough <jkeough@45drives.com>  Fri, 27 Feb 2026 08:17:24 -0400
+
+45drives-tools (4.0.37-1jammy) jammy; urgency=medium
+
+  * Removes lines preventing dmap from working on HL15
+
+ -- Jordan Keough <jkeough@45drives.com>  Wed, 28 Jan 2026 10:00:53 -0400
+
+45drives-tools (4.0.36-2jammy) jammy; urgency=medium
+
+  * Missed a commit in last merge, now has full fix for virtual nvme block devices
+    (ubu20)
+
+ -- Jordan Keough <jkeough@45drives.com>  Thu, 22 Jan 2026 06:06:59 -0400
+
+45drives-tools (4.0.36-1jammy) jammy; urgency=medium
+
+  * Merges nvme drive mapping and loadtest fixes to handle custom nvme aliasing paths
+    as seen on ubu20 systems
+
+ -- Jordan Keough <jkeough@45drives.com>  Thu, 22 Jan 2026 05:31:52 -0400
+
+45drives-tools (4.0.35-1jammy) jammy; urgency=medium
+
+  * Updates loadtest to properly detect non-standard custom nvme aliasing paths (as
+    seen on ubu20 systems)
+
+ -- Jordan Keough <jkeough@45drives.com>  Fri, 09 Jan 2026 05:45:27 -0400
+
+45drives-tools (4.0.34-1jammy) jammy; urgency=medium
+
+  * Fixes nvme drive mapping on ubuntu 20
+
+ -- Jordan Keough <jkeough@45drives.com>  Thu, 08 Jan 2026 10:23:38 -0400
+
+45drives-tools (4.0.33-1jammy) jammy; urgency=medium
+
+  * Updates ubm udev trigger logic to run when 'change' actions trigger in addition
+    to 'add' actions
+
+ -- Jordan Keough <jkeough@45drives.com>  Mon, 05 Jan 2026 08:47:20 -0400
+
 45drives-tools (4.0.32-1jammy) jammy; urgency=medium
 
   * Hotfix - reverses hl4 slot order
diff --git a/tools/dmap b/tools/dmap
@@ -505,7 +505,8 @@ def create_vdev_id(server):
 			"F8X3":[20,20,20]
 		},
   		"STUDIO":{
-			"STUDIO8":[4,4]
+			"STUDIO8":[4,4],
+   			"STUDIO15":[15],
 		},
 		"?":{
 			"?":[0]
diff --git a/tools/id_disk_custom_alias b/tools/id_disk_custom_alias
@@ -7,7 +7,9 @@ from typing import List, Tuple, Optional, Dict
 import pyudev
 import sys
 import os
+import re
 
+context = pyudev.Context()
 
 def set_env_var(key, value):
     print(f"{key}={value}")
@@ -51,21 +53,19 @@ def get_device_from_devpath(devpath: str) -> pyudev.Device:
     Given a DEVPATH (e.g. '/devices/.../tty/ttyUSB0'),
     return the corresponding pyudev Device.
     """
-    context = pyudev.Context()
     sys_path = os.path.join("/sys", devpath.lstrip("/"))
     return pyudev.Devices.from_sys_path(context, sys_path)
 
 
-def iter_kernel_ancestors(device: pyudev.Device, include_self: bool = False):
-    """
-    Yield sys_name (kernel name) for the device and its parents.
-
-    sys_name is what udev matches with KERNELS=="...".
-    """
-    dev = device if include_self else device.parent
-    while dev is not None:
-        yield dev
-        dev = dev.parent
+def get_pcieport_parent_sys_name(device: pyudev.Device) -> Optional[str]:
+    try:
+        pcieport_parent = next(
+            d for d in device.ancestors if d.driver == "pcieport"
+        )
+        return pcieport_parent.sys_name
+    except StopIteration:
+        # no pcieport parent found
+        return None
 
 
 def main():
@@ -86,22 +86,23 @@ def main():
     if not devpath:
         set_env_var("CUSTOM_ALIAS_ERR", "device path not provided!")
         return
-
+    
     device = get_device_from_devpath(devpath)
-
-    try:
-        pcieport_parent = next(
-            d for d in iter_kernel_ancestors(device) if d.driver == "pcieport"
-        )
-    except StopIteration:
-        # no pcieport parent found
-        return
-
-    if pcieport_parent.sys_name not in alias_parents:
+    pcieport_parent_sys_name = get_pcieport_parent_sys_name(device)
+    if pcieport_parent_sys_name is None:
+        # special case for NVMe:
+        # try stripping down to nvme subsystem device
+        nvme_block_name: str = device.sys_name
+        m = re.match(r"(nvme\d+)n\d+", nvme_block_name)
+        if m:
+            nvme_device = pyudev.Devices.from_name(context, "nvme", m.group(1))
+            pcieport_parent_sys_name = get_pcieport_parent_sys_name(nvme_device)
+
+    if pcieport_parent_sys_name not in alias_parents:
         # not mapped
         return
 
-    alias = alias_parents[pcieport_parent.sys_name]
+    alias = alias_parents[pcieport_parent_sys_name]
 
     set_env_var("ID_VDEV", alias)
     set_env_var("ID_VDEV_PATH", os.path.join("disk/by-vdev", alias))
diff --git a/tools/loadtest b/tools/loadtest
diff --git a/tools/lsdev b/tools/lsdev
diff --git a/tools/server_identifier b/tools/server_identifier
diff --git a/udev/68-0-custom-aliases.rules b/udev/68-0-custom-aliases.rules

-Original file line number
+Diff line change
@@ @@ -0,0 +1,15 @@ @@
 +1-1
 +1-2
 +1-3
 +1-4
 +1-5
 +1-6
 +1-7
 +1-8
 +1-9
 +1-10
 +1-11
 +1-12
 +1-13
 +1-14
 +1-15