From adbc80c31c78ef75aaaf3dec92b0f585b14eb700 Mon Sep 17 00:00:00 2001 From: Aleksandr Zimin Date: Fri, 19 Apr 2024 10:15:29 +0300 Subject: [PATCH] fix Signed-off-by: Aleksandr Zimin --- images/sds-local-volume-csi/driver/node.go | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/images/sds-local-volume-csi/driver/node.go b/images/sds-local-volume-csi/driver/node.go index bc8390a9..d67e3719 100644 --- a/images/sds-local-volume-csi/driver/node.go +++ b/images/sds-local-volume-csi/driver/node.go @@ -219,13 +219,11 @@ func (d *Driver) NodePublishVolume(ctx context.Context, request *csi.NodePublish d.inFlight.Delete(volumeID) }() + fsType := "" + switch volCap.GetAccessType().(type) { case *csi.VolumeCapability_Block: d.log.Trace("[NodePublishVolume] Block volume detected.") - err := d.storeManager.BindMount(source, target, "", mountOptions) - if err != nil { - return nil, status.Errorf(codes.Internal, "[NodePublishVolume] Error bind mounting block volume %q. Source: %q. Target: %q: %v", volumeID, source, target, err) - } case *csi.VolumeCapability_Mount: d.log.Trace("[NodePublishVolume] Mount volume detected.") mountVolume := volCap.GetMount() @@ -243,13 +241,11 @@ func (d *Driver) NodePublishVolume(ctx context.Context, request *csi.NodePublish } mountOptions = collectMountOptions(fsType, mountVolume.GetMountFlags(), mountOptions) + } - err := d.storeManager.BindMount(source, target, fsType, mountOptions) - - if err != nil { - return nil, status.Errorf(codes.Internal, "[NodePublishVolume] Error bind mounting volume %q. Source: %q. Target: %q: %v", volumeID, source, target, err) - } - + err := d.storeManager.BindMount(source, target, fsType, mountOptions) + if err != nil { + return nil, status.Errorf(codes.Internal, "[NodePublishVolume] Error bind mounting volume %q. Source: %q. Target: %q. Mount options:%v. Err: %v", volumeID, source, target, mountOptions, err) } return &csi.NodePublishVolumeResponse{}, nil