Various fixes + improvements with respect to recent caching changes

Dockerfile

@@ -20,7 +20,7 @@ FROM --platform=$BUILDPLATFORM golang:1 as downloader
 
 ARG TARGETOS
 ARG TARGETARCH
-ARG LINSTOR_WAIT_UNTIL_VERSION=v0.2.1
+ARG LINSTOR_WAIT_UNTIL_VERSION=v0.2.2
 RUN curl -fsSL https://github.com/LINBIT/linstor-wait-until/releases/download/$LINSTOR_WAIT_UNTIL_VERSION/linstor-wait-until-$LINSTOR_WAIT_UNTIL_VERSION-$TARGETOS-$TARGETARCH.tar.gz | tar xvzC /
 
 FROM debian:bookworm-slim

cmd/linstor-csi/linstor-csi.go

@@ -51,7 +51,7 @@ func main() {
 		propNs                = flag.String("property-namespace", linstor.NamespcAuxiliary, "Limit the reported topology keys to properties from the given namespace.")
 		labelBySP             = flag.Bool("label-by-storage-pool", true, "Set to false to disable labeling of nodes based on their configured storage pools.")
 		nodeCacheTimeout      = flag.Duration("node-cache-timeout", 1*time.Minute, "Duration for which the results of node and storage pool related API responses should be cached.")
-		resourceCacheTimeout  = flag.Duration("resource-cache-timeout", 1*time.Minute, "Duration for which the results of resource related API responses should be cached.")
+		resourceCacheTimeout  = flag.Duration("resource-cache-timeout", 30*time.Second, "Duration for which the results of resource related API responses should be cached.")
 	)
 
 	flag.Var(&volume.DefaultRemoteAccessPolicy, "default-remote-access-policy", "")

go.mod

@@ -5,7 +5,7 @@ go 1.22.0
 toolchain go1.22.2
 
 require (
-	github.com/LINBIT/golinstor v0.52.0
+	github.com/LINBIT/golinstor v0.52.1
 	github.com/container-storage-interface/spec v1.9.0
 	github.com/haySwim/data v0.2.0
 	github.com/kubernetes-csi/csi-test/v5 v5.2.0

go.sum

@@ -1,5 +1,5 @@
-github.com/LINBIT/golinstor v0.52.0 h1:b+l26DJvLxGIYuvopLFJUoE7aywa6oCmCeL3jav3kKM=
-github.com/LINBIT/golinstor v0.52.0/go.mod h1:D811Eyjhoy6t1Tl36HTW4by0s6O5g0cVgV/t58oN+0g=
+github.com/LINBIT/golinstor v0.52.1 h1:TBLv3E9Lr7cEDQvorRivZhtZS5xP1oUUOxoAGBwJoAg=
+github.com/LINBIT/golinstor v0.52.1/go.mod h1:D811Eyjhoy6t1Tl36HTW4by0s6O5g0cVgV/t58oN+0g=
 github.com/container-storage-interface/spec v1.9.0 h1:zKtX4STsq31Knz3gciCYCi1SXtO2HJDecIjDVboYavY=
 github.com/container-storage-interface/spec v1.9.0/go.mod h1:ZfDu+3ZRyeVqxZM0Ds19MVLkN2d1XJ5MAfi1L3VjlT0=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

pkg/client/linstor.go

@@ -621,14 +621,14 @@ func (s *Linstor) Detach(ctx context.Context, volId, node string) error {
 		}
 	}
 
-	if resInUse <= 1 {
+	if resInUse == 1 {
 		rdPropsModify := lapi.GenericPropsModify{DeleteProps: []string{
 			linstor.PropertyAllowTwoPrimaries,
 		}}
 
 		err = s.client.ResourceDefinitions.Modify(ctx, volId, rdPropsModify)
 		if err != nil {
-			return err
+			return nil404(err)
 		}
 	}
 
@@ -2102,7 +2102,7 @@ func linstorifyResourceName(name string) (string, error) {
 }
 
 func nil404(e error) error {
-	if e == lapi.NotFoundError {
+	if errors.Is(e, lapi.NotFoundError) {
 		return nil
 	}
 	return e

pkg/driver/driver.go

@@ -671,6 +671,10 @@ func (d Driver) ControllerPublishVolume(ctx context.Context, req *csi.Controller
 			"ControllerPublishVolume failed for %s: %v", req.GetVolumeId(), err)
 	}
 
+	if devPath == "" {
+		return nil, status.Errorf(codes.Internal, "ControllerPublishVolume failed for %s: could not determine device path", req.GetVolumeId())
+	}
+
 	return &csi.ControllerPublishVolumeResponse{
 		PublishContext: (&PublishContext{
 			DevicePath: devPath,

pkg/driver/volume_context.go

@@ -20,7 +20,6 @@ type VolumeContext struct {
 	MountOptions        []string
 	PostMountXfsOptions string
 	RemoteAccessPolicy  volume.RemoteAccessPolicy
-	DevicePath          string
 }
 
 // NewVolumeContext creates a new default volume context, which does not specify any fancy mkfs/mount/post-mount options
@@ -57,7 +56,6 @@ func VolumeContextFromMap(ctx map[string]string) (*VolumeContext, error) {
 		MountOptions:        mountOpts,
 		PostMountXfsOptions: ctx[PostMountXfsOpts],
 		RemoteAccessPolicy:  policy,
-		DevicePath:          ctx[DevicePath],
 	}, nil
 }
 
@@ -72,7 +70,6 @@ func (v *VolumeContext) ToMap() (map[string]string, error) {
 		MountOptions:           encodeMountOpts(v.MountOptions),
 		PostMountXfsOpts:       v.PostMountXfsOptions,
 		RemoteAccessPolicyOpts: string(policy),
-		DevicePath:             v.DevicePath,
 	}, nil
 }