Skip to content

fix(sbs): use new SBS volume id convention #65

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
nox-404 merged 2 commits into from
Mar 6, 2024
Merged

fix(sbs): use new SBS volume id convention #65

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a14499
fix(sbs): use new SBS volume id convention
Mar 5, 2024
7491e8e
fix(sbs): fallback to b_ssd volume id convention
Mar 5, 2024
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: 16 additions & 2 deletions pkg/driver/diskutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ import (
)

const (
diskByIDPath = "/dev/disk/by-id"
diskSCWPrefix = "scsi-0SCW_b_ssd_volume-"
diskByIDPath = "/dev/disk/by-id"
// TODO(nox): DEPRECATION B_SSD - remove legacy format when legacy volumes are fully phased out.
legacyDiskSCWPrefix = "scsi-0SCW_b_ssd_volume-"
diskSCWPrefix = "scsi-0SCW_sbs_volume-"
diskLuksMapperPrefix = "scw-luks-"
diskLuksMapperPath = "/dev/mapper/"

Expand Down Expand Up @@ -80,6 +82,13 @@ func devicePath(volumeID string) string {
return path.Join(diskByIDPath, diskSCWPrefix+volumeID)
}

// legacyDevicePath returns the legacy b_ssd volume path
//
// TODO(nox): DEPRECATION B_SSD - remove legacy mode when legacy volumes are fully phased out.
func legacyDevicePath(volumeID string) string {
return path.Join(diskByIDPath, legacyDiskSCWPrefix+volumeID)
}

// EncryptAndOpenDevice encrypts the volume with the given ID with the given passphrase and opens it
// If the device is already encrypted (LUKS header present), it will only open the device.
func (d *diskUtils) EncryptAndOpenDevice(volumeID string, passphrase string) (string, error) {
Expand Down Expand Up @@ -211,6 +220,11 @@ func (d *diskUtils) MountToTarget(sourcePath, targetPath, fsType string, mountOp
func (d *diskUtils) GetDevicePath(volumeID string) (string, error) {
devicePath := devicePath(volumeID)
realDevicePath, err := filepath.EvalSymlinks(devicePath)
// TODO(nox): DEPRECATION B_SSD - remove legacy fallback when legacy volumes are fully phased out.
if err != nil && errors.Is(err, fs.ErrNotExist) {
devicePath = legacyDevicePath(volumeID)
realDevicePath, err = filepath.EvalSymlinks(devicePath)
}
if err != nil {
return "", fmt.Errorf("failed to get real device path: %w", err)
}
Expand Down