address some PR comments

client/csi_endpoint.go

@@ -271,7 +271,7 @@ func (c *CSI) ControllerExpandVolume(req *structs.ClientCSIControllerExpandVolum
 	}
 	resp.CapacityBytes = cresp.CapacityBytes
 	resp.NodeExpansionRequired = cresp.NodeExpansionRequired
-	return err
+	return nil
 }
 
 func (c *CSI) ControllerDeleteVolume(req *structs.ClientCSIControllerDeleteVolumeRequest, resp *structs.ClientCSIControllerDeleteVolumeResponse) error {

nomad/csi_endpoint.go

@@ -382,22 +382,22 @@ func (v *CSIVolume) Register(args *structs.CSIVolumeRegisterRequest, reply *stru
 	return nil
 }
 
-// reconcileVolume updates the "old" volume with many of the contents of "new"
+// reconcileVolume updates a volume with many of the contents of another.
 // It may or may not do extra work to actually expand a volume outside of Nomad,
 // depending on whether requested capacity values have changed.
-func (v *CSIVolume) reconcileVolume(plugin *structs.CSIPlugin, old *structs.CSIVolume, new *structs.CSIVolume) error {
+func (v *CSIVolume) reconcileVolume(plugin *structs.CSIPlugin, vol *structs.CSIVolume, update *structs.CSIVolume) error {
 	// Merge does some validation, before we attempt any potential CSI RPCs,
-	// and mutates `old` with (most of) the values of `new`
-	err := old.Merge(new) // this skips capacity values
+	// and mutates `vol` with (most of) the values of `update`,
+	// notably excluding capacity values, which are covered below.
+	err := vol.Merge(update)
 	if err != nil {
 		return err
 	}
 	// expandVolume will mutate `old` with new capacity-related values, if needed.
-	err = v.expandVolume(old, plugin, &csi.CapacityRange{
-		RequiredBytes: new.RequestedCapacityMin,
-		LimitBytes:    new.RequestedCapacityMax,
+	return v.expandVolume(vol, plugin, &csi.CapacityRange{
+		RequiredBytes: update.RequestedCapacityMin,
+		LimitBytes:    update.RequestedCapacityMax,
 	})
-	return err
 }
 
 // Deregister removes a set of volumes
@@ -1059,8 +1059,6 @@ func (v *CSIVolume) Create(args *structs.CSIVolumeCreateRequest, reply *structs.
 	}
 	validatedVols := []validated{}
 
-	ws := memdb.NewWatchSet()
-
 	// This is the only namespace we ACL checked, force all the volumes to use it.
 	// We also validate that the plugin exists for each plugin, and validate the
 	// capabilities when the plugin has a controller.
@@ -1088,7 +1086,7 @@ func (v *CSIVolume) Create(args *structs.CSIVolumeCreateRequest, reply *structs.
 			return err
 		}
 		// current will be nil if it does not exist.
-		current, err := snap.CSIVolumeByID(ws, vol.Namespace, vol.ID)
+		current, err := snap.CSIVolumeByID(nil, vol.Namespace, vol.ID)
 		if err != nil {
 			return err
 		}
@@ -1117,7 +1115,7 @@ func (v *CSIVolume) Create(args *structs.CSIVolumeCreateRequest, reply *structs.
 			cp := valid.current.Copy()
 			err = v.reconcileVolume(valid.plugin, cp, valid.vol)
 			if err != nil {
-				multierror.Append(&mErr, err)
+				mErr.Errors = append(mErr.Errors, err)
 			} else {
 				// we merged valid.vol into cp, so update state with the copy
 				regArgs.Volumes = append(regArgs.Volumes, cp)
@@ -1126,7 +1124,7 @@ func (v *CSIVolume) Create(args *structs.CSIVolumeCreateRequest, reply *structs.
 		} else {
 			err = v.createVolume(valid.vol, valid.plugin)
 			if err != nil {
-				multierror.Append(&mErr, err)
+				mErr.Errors = append(mErr.Errors, err)
 			} else {
 				regArgs.Volumes = append(regArgs.Volumes, valid.vol)
 			}
@@ -1138,7 +1136,7 @@ func (v *CSIVolume) Create(args *structs.CSIVolumeCreateRequest, reply *structs.
 		_, index, err = v.srv.raftApply(structs.CSIVolumeRegisterRequestType, regArgs)
 		if err != nil {
 			v.logger.Error("csi raft apply failed", "error", err, "method", "register")
-			multierror.Append(&mErr, err)
+			mErr.Errors = append(mErr.Errors, err)
 		}
 	}
 
@@ -1268,7 +1266,7 @@ func (v *CSIVolume) expandVolume(vol *structs.CSIVolume, plugin *structs.CSIPlug
 	cReq.PluginID = plugin.ID
 	cResp := &cstructs.ClientCSIControllerExpandVolumeResponse{}
 
-	logger().Info("expanding volume")
+	logger().Debug("expanding volume")
 	// This is the real work. The client RPC sends a gRPC to the controller plugin,
 	// then that controller may reach out to cloud APIs, etc.
 	err = v.serializedControllerRPC(plugin.ID, func() error {
@@ -1279,7 +1277,7 @@ func (v *CSIVolume) expandVolume(vol *structs.CSIVolume, plugin *structs.CSIPlug
 	}
 
 	vol.Capacity = cResp.CapacityBytes
-	logger().Info("controller done expanding")
+	logger().Debug("controller done expanding")
 
 	if cResp.NodeExpansionRequired {
 		v.logger.Warn("TODO: also do node volume expansion if needed") // TODO

nomad/structs/csi.go

@@ -6,12 +6,12 @@ package structs
 import (
 	"errors"
 	"fmt"
+	"maps"
+	"slices"
 	"strings"
 	"time"
 
 	multierror "github.com/hashicorp/go-multierror"
-	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
 
 	"github.com/hashicorp/nomad/helper"
 )