github/zfssa-csi-driver
1
0
Fork 0
mirror of https://github.com/oracle/zfssa-csi-driver.git synced 2025-06-29 15:06:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

NodeUnpublishVolume should be idempotent (#19)

Browse Source
This commit is contained in:
Helen Zhang 2024-01-05 12:26:34 -08:00 committed by GitHub
parent e33ae8e8dd
commit 817778f1c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/service/node_fs.go
View File

@ -10,9 +10,9 @@ import (
"os" "os"
"strings" "strings"
"github.com/container-storage-interface/spec/lib/go/csi"
"github.com/oracle/zfssa-csi-driver/pkg/utils" "github.com/oracle/zfssa-csi-driver/pkg/utils"
"github.com/oracle/zfssa-csi-driver/pkg/zfssarest" "github.com/oracle/zfssa-csi-driver/pkg/zfssarest"
"github.com/container-storage-interface/spec/lib/go/csi"
"golang.org/x/net/context" "golang.org/x/net/context"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
"google.golang.org/grpc/status" "google.golang.org/grpc/status"
@ -75,12 +75,19 @@ func (zd *ZFSSADriver) nodeUnpublishFilesystemVolume(token *zfssarest.Token,
return nil, status.Error(codes.InvalidArgument, "Target path not provided") return nil, status.Error(codes.InvalidArgument, "Target path not provided")
} }
if _, pathErr := os.Stat(targetPath); os.IsNotExist(pathErr) {
//targetPath doesn't exist; nothing to do
utils.GetLogNODE(ctx, 2).Println("nodeUnpublishFilesystemVolume targetPath doesn't exist", targetPath)
return &csi.NodeUnpublishVolumeResponse{}, nil
}
err := zd.NodeMounter.Unmount(targetPath) err := zd.NodeMounter.Unmount(targetPath)
if err != nil { if err != nil {
utils.GetLogNODE(ctx, 2).Println("Cannot unmount volume", utils.GetLogNODE(ctx, 2).Println("Cannot unmount volume",
"volume_id", req.GetVolumeId(), "error", err.Error()) "volume_id", req.GetVolumeId(), "error", err.Error())
if !strings.Contains(err.Error(), "not mounted") {
return nil, status.Error(codes.Internal, err.Error()) return nil, status.Error(codes.Internal, err.Error())
} }
}
notMnt, mntErr := zd.NodeMounter.IsLikelyNotMountPoint(targetPath) notMnt, mntErr := zd.NodeMounter.IsLikelyNotMountPoint(targetPath)
if mntErr != nil { if mntErr != nil {