kubernetes-csi/csi-driver-nfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: internalUnmount failure and DeleteVolume failure

Browse Source
This commit is contained in:
Jiaxun Song 2020-11-16 06:09:21 +00:00
parent d325ee36ad
commit 868db6667a
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -103,7 +103,8 @@ e2e-bootstrap: install-helm
docker pull $(IMAGE_TAG) || make container push docker pull $(IMAGE_TAG) || make container push
helm install csi-driver-nfs ./charts/latest/csi-driver-nfs --namespace kube-system --wait --timeout=15m -v=5 --debug \ helm install csi-driver-nfs ./charts/latest/csi-driver-nfs --namespace kube-system --wait --timeout=15m -v=5 --debug \
--set image.nfs.repository=$(REGISTRY)/$(IMAGE_NAME) \ --set image.nfs.repository=$(REGISTRY)/$(IMAGE_NAME) \
--set image.nfs.tag=$(IMAGE_VERSION) --set image.nfs.tag=$(IMAGE_VERSION) \
--set image.nfs.pullPolicy=Always
.PHONY: e2e-teardown .PHONY: e2e-teardown
e2e-teardown: e2e-teardown:

2
charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml
View File

@ -57,7 +57,7 @@ spec:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: CSI_ENDPOINT - name: CSI_ENDPOINT
value: unix://plugin/csi.sock value: unix://plugin/csi.sock
imagePullPolicy: "IfNotPresent" imagePullPolicy: {{ .Values.image.nfs.pullPolicy }}
volumeMounts: volumeMounts:
- name: plugin-dir - name: plugin-dir
mountPath: /plugin mountPath: /plugin

9
pkg/nfs/controllerserver.go
View File

@ -260,6 +260,7 @@ func (cs *ControllerServer) internalUnmount(ctx context.Context, vol *nfsVolume)
// Unmount nfs server at base-dir // Unmount nfs server at base-dir
glog.V(4).Infof("internally unmounting %v", targetPath) glog.V(4).Infof("internally unmounting %v", targetPath)
_, err := cs.Driver.ns.NodeUnpublishVolume(ctx, &csi.NodeUnpublishVolumeRequest{ _, err := cs.Driver.ns.NodeUnpublishVolume(ctx, &csi.NodeUnpublishVolumeRequest{
VolumeId: vol.id,
TargetPath: cs.getInternalMountPath(vol), TargetPath: cs.getInternalMountPath(vol),
}) })
return err return err
@ -344,9 +345,9 @@ func (cs *ControllerServer) nfsVolToCSI(vol *nfsVolume, reqCapacity int64) *csi.
// Given a nfsVolume, return a CSI volume id // Given a nfsVolume, return a CSI volume id
func (cs *ControllerServer) getVolumeIdFromNfsVol(vol *nfsVolume) string { func (cs *ControllerServer) getVolumeIdFromNfsVol(vol *nfsVolume) string {
idElements := make([]string, totalIDElements) idElements := make([]string, totalIDElements)
idElements[idServer] = vol.server idElements[idServer] = strings.Trim(vol.server, "/")
idElements[idBaseDir] = vol.baseDir idElements[idBaseDir] = strings.Trim(vol.baseDir, "/")
idElements[idSubDir] = vol.subDir idElements[idSubDir] = strings.Trim(vol.subDir, "/")
return strings.Join(idElements, "/") return strings.Join(idElements, "/")
} }
@ -354,7 +355,7 @@ func (cs *ControllerServer) getVolumeIdFromNfsVol(vol *nfsVolume) string {
func (cs *ControllerServer) getNfsVolFromId(id string) (*nfsVolume, error) { func (cs *ControllerServer) getNfsVolFromId(id string) (*nfsVolume, error) {
tokens := strings.Split(id, "/") tokens := strings.Split(id, "/")
if len(tokens) != totalIDElements { if len(tokens) != totalIDElements {
return nil, fmt.Errorf("volume id %q unexpected format: got %v tokens", id, len(tokens)) return nil, fmt.Errorf("volume id %q unexpected format: got %v token(s) instead of %v", id, len(tokens), totalIDElements)
} }
return &nfsVolume{ return &nfsVolume{

3
test/e2e/testsuites/dynamically_provisioned_reclaim_policy_tester.go
View File

@ -44,7 +44,8 @@ func (t *DynamicallyProvisionedReclaimPolicyTest) Run(client clientset.Interface
if tpvc.ReclaimPolicy() == v1.PersistentVolumeReclaimRetain { if tpvc.ReclaimPolicy() == v1.PersistentVolumeReclaimRetain {
tpvc.WaitForPersistentVolumePhase(v1.VolumeReleased) tpvc.WaitForPersistentVolumePhase(v1.VolumeReleased)
tpvc.DeleteBoundPersistentVolume() tpvc.DeleteBoundPersistentVolume()
tpvc.DeleteBackingVolume(&t.ControllerServer) // The controler server cannot resolve the nfs server hosting inside the testing k8s cluster, skipping the cleanup step.
// tpvc.DeleteBackingVolume(&t.ControllerServer)
} }
} }
} }