fix: update unpublish volume methods to handle mounted state (#15)

Signed-off-by: caoyifan.cyf <[email protected]>

Author: EvanCley

pkg/service/node.go

@@ -172,24 +172,23 @@ func (s *Service) nodeUnpublishVolume(
 	}
 
 	if !isMounted {
-		logger.WithContext(ctx).Infof("target path is already umounted")
-		return &csi.NodeUnpublishVolumeResponse{}, isStaticVolume, nil
+		logger.WithContext(ctx).Warnf("target path is already umounted")
 	}
 
 	if isStaticVolume {
-		resp, err := s.nodeUnPublishVolumeStatic(ctx, volumeID, targetPath)
+		resp, err := s.nodeUnPublishVolumeStatic(ctx, volumeID, targetPath, isMounted)
 		return resp, isStaticVolume, err
 	}
 
 	statusPath := filepath.Join(s.cfg.Get().GetVolumeDir(volumeID), "status.json")
 	volumeStatus, err := s.sm.Get(statusPath)
 	if err == nil && volumeStatus != nil && volumeStatus.Inline {
 		logger.WithContext(ctx).Infof("unpublishing static inline volume: %s", volumeStatus.Reference)
-		resp, err := s.nodeUnPublishVolumeStaticInlineVolume(ctx, volumeID, targetPath)
+		resp, err := s.nodeUnPublishVolumeStaticInlineVolume(ctx, volumeID, targetPath, isMounted)
 		return resp, isStaticVolume, err
 	}
 
-	resp, err := s.nodeUnPublishVolumeDynamic(ctx, volumeID, targetPath)
+	resp, err := s.nodeUnPublishVolumeDynamic(ctx, volumeID, targetPath, isMounted)
 	return resp, isStaticVolume, err
 }
 

pkg/service/node_dynamic.go

@@ -49,7 +49,7 @@ func (s *Service) nodePublishVolumeDynamicForRootMount(ctx context.Context, volu
 	return &csi.NodePublishVolumeResponse{}, nil
 }
 
-func (s *Service) nodeUnPublishVolumeDynamic(ctx context.Context, volumeName, targetPath string) (*csi.NodeUnpublishVolumeResponse, error) {
+func (s *Service) nodeUnPublishVolumeDynamic(ctx context.Context, volumeName, targetPath string, isMounted bool) (*csi.NodeUnpublishVolumeResponse, error) {
 	sourceCSIDir := s.cfg.Get().GetCSISockDirForDynamic(volumeName)
 	volumeDir := s.cfg.Get().GetVolumeDirForDynamic(volumeName)
 
@@ -71,8 +71,10 @@ func (s *Service) nodeUnPublishVolumeDynamic(ctx context.Context, volumeName, ta
 		}
 	}
 
-	if err := mounter.UMount(ctx, targetPath, true); err != nil {
-		logger.WithContext(ctx).WithError(err).Errorf("unmount target path")
+	if isMounted {
+		if err := mounter.UMount(ctx, targetPath, true); err != nil {
+			return nil, status.Error(codes.Internal, errors.Wrapf(err, "unmount target path").Error())
+		}
 	}
 
 	sourceVolumeDir := s.cfg.Get().GetVolumeDirForDynamic(volumeName)

pkg/service/node_static.go

@@ -39,9 +39,11 @@ func (s *Service) nodePublishVolumeStatic(ctx context.Context, volumeName, targe
 	return &csi.NodePublishVolumeResponse{}, nil
 }
 
-func (s *Service) nodeUnPublishVolumeStatic(ctx context.Context, volumeName, targetPath string) (*csi.NodeUnpublishVolumeResponse, error) {
-	if err := mounter.UMount(ctx, targetPath, true); err != nil {
-		return nil, status.Error(codes.Internal, errors.Wrapf(err, "unmount target path").Error())
+func (s *Service) nodeUnPublishVolumeStatic(ctx context.Context, volumeName, targetPath string, isMounted bool) (*csi.NodeUnpublishVolumeResponse, error) {
+	if isMounted {
+		if err := mounter.UMount(ctx, targetPath, true); err != nil {
+			return nil, status.Error(codes.Internal, errors.Wrapf(err, "unmount target path").Error())
+		}
 	}
 
 	statusPath := filepath.Join(s.cfg.Get().GetVolumeDir(volumeName), "status.json")

pkg/service/node_static_inline.go

@@ -51,10 +51,11 @@ func (s *Service) nodePublishVolumeStaticInlineVolume(ctx context.Context, volum
 	return &csi.NodePublishVolumeResponse{}, nil
 }
 
-func (s *Service) nodeUnPublishVolumeStaticInlineVolume(ctx context.Context, volumeName, targetPath string) (*csi.NodeUnpublishVolumeResponse, error) {
-	if err := mounter.UMount(ctx, targetPath, true); err != nil {
-		logger.WithContext(ctx).WithError(err).Errorf("unmount target path")
-		// return nil, status.Error(codes.Internal, errors.Wrapf(err, "unmount target path").Error())
+func (s *Service) nodeUnPublishVolumeStaticInlineVolume(ctx context.Context, volumeName, targetPath string, isMounted bool) (*csi.NodeUnpublishVolumeResponse, error) {
+	if isMounted {
+		if err := mounter.UMount(ctx, targetPath, true); err != nil {
+			return nil, status.Error(codes.Internal, errors.Wrapf(err, "unmount target path").Error())
+		}
 	}
 
 	sourceVolumeDir := s.cfg.Get().GetVolumeDir(volumeName)