@@ -81,7 +81,13 @@ func (w *WrappedNodeService) NodePublishVolume(ctx context.Context, req *csi.Nod
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to create temp mount dir: %v", err)
 	}
-	defer os.Remove(tmpMount)
+	// Logged, not returned: a leftover temp dir does not make the volume
+	// unusable, and failing an otherwise good publish only makes kubelet retry.
+	defer func() {
+		if err := os.Remove(tmpMount); err != nil {
+			klog.Warningf("Failed to remove temp dir %s: %v", tmpMount, err)
+		}
+	}()
 
 	rootSource := fmt.Sprintf("%s:%s", host, path)
 	rootOpts := []string{"nfsvers=4.2", fmt.Sprintf("port=%s", port)}
 
@@ -1,8 +1,15 @@
 package main
 
 import (
+	"bytes"
+	"context"
+	"os"
+	"path/filepath"
+	"strings"
 	"testing"
 
+	csi "github.com/container-storage-interface/spec/lib/go/csi"
+	"k8s.io/klog/v2"
 	mount "k8s.io/mount-utils"
 )
 
@@ -25,3 +32,40 @@ func TestIsNFSMount(t *testing.T) {
 		}
 	}
 }
+
+// The fake mounter mounts nothing, so the /data subdir the publish creates
+// lands in the temp dir itself and its removal fails with ENOTEMPTY.
+func TestNodePublishVolumeNFSLogsTempDirRemovalFailure(t *testing.T) {
+	tmpRoot := t.TempDir()
+	t.Setenv("TMPDIR", tmpRoot)
+
+	var logs bytes.Buffer
+	klog.LogToStderr(false)
+	klog.SetOutput(&logs)
+	t.Cleanup(func() {
+		klog.SetOutput(os.Stderr)
+		klog.LogToStderr(true)
+	})
+
+	w := &WrappedNodeService{mounter: mount.NewFakeMounter(nil)}
+	req := &csi.NodePublishVolumeRequest{
+		VolumeId:       "pvc-1",
+		TargetPath:     filepath.Join(t.TempDir(), "target"),
+		PublishContext: map[string]string{nfsExportKey: "nfs://192.0.2.10:2049/export"},
+	}
+	if _, err := w.NodePublishVolume(context.Background(), req); err != nil {
+		t.Fatalf("NodePublishVolume: %v", err)
+	}
+	klog.Flush()
+
+	leftovers, err := filepath.Glob(filepath.Join(tmpRoot, "nfs-init-pvc-1-*"))
+	if err != nil || len(leftovers) != 1 {
+		t.Fatalf("expected one leftover temp dir, got %v (err %v)", leftovers, err)
+	}
+	for _, line := range strings.Split(logs.String(), "\n") {
+		if strings.HasPrefix(line, "W") && strings.Contains(line, leftovers[0]) {
+			return
+		}
+	}
+	t.Errorf("removal failure of %s was not logged as a warning; log output:\n%s", leftovers[0], logs.String())
+}