Skip to content

Revert "Noble VMs on AWS don't have /dev/sdX devices for some reason." #391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aramprice merged 1 commit into from
Dec 11, 2025
Merged

Revert "Noble VMs on AWS don't have /dev/sdX devices for some reason." #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions infrastructure/devicepathresolver/mapped_device_path_resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package devicepathresolver

import (
"fmt"
"os"
"path/filepath"
"strings"
Expand Down Expand Up @@ -58,17 +57,16 @@ func (dpr mappedDevicePathResolver) findPossibleDevice(devicePath string) (strin
needsMapping := strings.HasPrefix(devicePath, "/dev/sd")

if needsMapping { //nolint:nestif
pathLetterSuffix := strings.Split(devicePath, "/dev/sd")[1]
pathNumberSuffix := fmt.Sprintf("%d", pathLetterSuffix[0]-97) // a=0, b=1

possiblePaths := []string{
"/dev/xvd" + pathLetterSuffix, // Xen
"/dev/vd" + pathLetterSuffix, // KVM
"/dev/sd" + pathLetterSuffix,
"/dev/nvme" + pathNumberSuffix + "n1", // Nitro instances with Noble
pathSuffix := strings.Split(devicePath, "/dev/sd")[1]

possiblePrefixes := []string{
"/dev/xvd", // Xen
"/dev/vd", // KVM
"/dev/sd",
}

for _, path := range possiblePaths {
for _, prefix := range possiblePrefixes {
path := prefix + pathSuffix
if dpr.fs.FileExists(path) {
return path, true, nil
}
Expand Down
14 changes: 0 additions & 14 deletions infrastructure/devicepathresolver/mapped_device_path_resolver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,20 +90,6 @@ var _ = Describe("mappedDevicePathResolver", func() {
})
})

Context("when a matching /dev/nvmeXn1 device is found", func() {
BeforeEach(func() {
err := fs.WriteFile("/dev/nvme0n1", []byte{})
Expect(err).NotTo(HaveOccurred())
})

It("returns the match", func() {
realPath, timedOut, err := resolver.GetRealDevicePath(diskSettings)
Expect(err).NotTo(HaveOccurred())
Expect(timedOut).To(BeFalse())
Expect(realPath).To(Equal("/dev/nvme0n1"))
})
})

Context("when no matching device is found the first time", func() {
Context("when the timeout has not expired", func() {
BeforeEach(func() {
Expand Down