From 32a3466b5623c05ac15dedba4d652af445b52df4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Peliz=C3=A4us?= Date: Fri, 31 Jan 2025 16:10:23 +0100 Subject: [PATCH] lxd/storage/drivers/powerflex: Cleanup error messages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julian Pelizäus --- lxd/storage/drivers/driver_powerflex.go | 11 ++++++----- lxd/storage/drivers/driver_powerflex_utils.go | 4 ++-- lxd/storage/drivers/driver_powerflex_volumes.go | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lxd/storage/drivers/driver_powerflex.go b/lxd/storage/drivers/driver_powerflex.go index d43a6bada25a..0f005ee997ff 100644 --- a/lxd/storage/drivers/driver_powerflex.go +++ b/lxd/storage/drivers/driver_powerflex.go @@ -1,6 +1,7 @@ package drivers import ( + "errors" "fmt" "strings" @@ -128,7 +129,7 @@ func (d *powerflex) FillConfig() error { d.config["powerflex.mode"] = connectors.TypeSDC } else { // Fail if no PowerFlex mode can be discovered. - return fmt.Errorf("Failed to discover PowerFlex mode") + return errors.New("Failed to discover PowerFlex mode") } } @@ -152,17 +153,17 @@ func (d *powerflex) Create() error { // Since those aren't any cluster member specific keys the general validation // rules allow empty strings in order to create the pending storage pools. if d.config["powerflex.pool"] == "" { - return fmt.Errorf("The powerflex.pool cannot be empty") + return errors.New("The powerflex.pool cannot be empty") } if d.config["powerflex.gateway"] == "" { - return fmt.Errorf("The powerflex.gateway cannot be empty") + return errors.New("The powerflex.gateway cannot be empty") } if d.config["powerflex.mode"] == connectors.TypeSDC { // In case the SDC mode is used the SDTs cannot be set. if d.config["powerflex.sdt"] != "" { - return fmt.Errorf("The powerflex.sdt config key is specific to the NVMe/TCP mode") + return fmt.Errorf("The %q config key is specific to the %q mode", "powerflex.sdt", connectors.TypeNVME) } } @@ -274,7 +275,7 @@ func (d *powerflex) Validate(config map[string]string) error { // Ensure powerflex.mode cannot be changed to avoid leaving volume mappings // and to prevent disturbing running instances. if oldMode != "" && oldMode != newMode { - return fmt.Errorf("PowerFlex mode cannot be changed") + return errors.New("PowerFlex mode cannot be changed") } // Check if the selected PowerFlex mode is supported on this node. diff --git a/lxd/storage/drivers/driver_powerflex_utils.go b/lxd/storage/drivers/driver_powerflex_utils.go index 30086abae182..da92e607dbcd 100644 --- a/lxd/storage/drivers/driver_powerflex_utils.go +++ b/lxd/storage/drivers/driver_powerflex_utils.go @@ -1195,12 +1195,12 @@ func (d *powerflex) resolvePool() (*powerFlexStoragePool, error) { func (d *powerflex) getVolumeName(vol Volume) (string, error) { volUUID, err := uuid.Parse(vol.config["volatile.uuid"]) if err != nil { - return "", fmt.Errorf(`Failed parsing "volatile.uuid" from volume %q: %w`, vol.name, err) + return "", fmt.Errorf("Failed parsing %q from volume %q: %w", "volatile.uuid", vol.name, err) } binUUID, err := volUUID.MarshalBinary() if err != nil { - return "", fmt.Errorf(`Failed marshalling the "volatile.uuid" of volume %q to binary format: %w`, vol.name, err) + return "", fmt.Errorf("Failed marshalling the %q of volume %q to binary format: %w", "volatile.uuid", vol.name, err) } // The volume's name in base64 encoded format. diff --git a/lxd/storage/drivers/driver_powerflex_volumes.go b/lxd/storage/drivers/driver_powerflex_volumes.go index 736f2693a0c8..e1de0ed25060 100644 --- a/lxd/storage/drivers/driver_powerflex_volumes.go +++ b/lxd/storage/drivers/driver_powerflex_volumes.go @@ -349,7 +349,7 @@ func (d *powerflex) DeleteVolume(vol Volume, op *operations.Operation) error { err = os.Remove(mountPath) if err != nil && !os.IsNotExist(err) { - return fmt.Errorf("Failed to remove '%s': %w", mountPath, err) + return fmt.Errorf("Failed to remove %q: %w", mountPath, err) } } @@ -577,7 +577,7 @@ func (d *powerflex) SetVolumeQuota(vol Volume, size string, allowUnsafeResize bo // PowerFlex supports increasing of size only. if sizeBytes < oldSizeBytes { - return fmt.Errorf("Volume capacity can only be increased") + return errors.New("Volume capacity can only be increased") } // Block image volumes cannot be resized because they have a readonly snapshot that doesn't get