Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PV Controller: fix recycling #70580

Merged
merged 1 commit into from
Nov 16, 2018
Merged

PV Controller: fix recycling #70580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 13 additions & 1 deletion pkg/controller/volume/persistentvolume/pv_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,7 +1127,19 @@ func (ctrl *PersistentVolumeController) recycleVolumeOperation(volume *v1.Persis
klog.V(3).Infof("can't recycle volume %q: %v", volume.Name, err)
return
}
if used {

// Verify the claim is in cache: if so, then it is a different PVC with the same name
// since the volume is known to be released at this moment. Ths new (cached) PVC must use
// a different PV -- we checked that the PV is unused in isVolumeReleased.
// So the old PV is safe to be recycled.
claimName := claimrefToClaimKey(volume.Spec.ClaimRef)
jsafrane marked this conversation as resolved.
Show resolved Hide resolved
_, claimCached, err := ctrl.claims.GetByKey(claimName)
if err != nil {
klog.V(3).Infof("error getting the claim %s from cache", claimName)
return
}

if used && !claimCached {
msg := fmt.Sprintf("Volume is used by pods: %s", strings.Join(pods, ","))
klog.V(3).Infof("can't recycle volume %q: %s", volume.Name, msg)
ctrl.eventRecorder.Event(volume, v1.EventTypeNormal, events.VolumeFailedRecycle, msg)
Expand Down
10 changes: 10 additions & 0 deletions pkg/controller/volume/persistentvolume/recycle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,16 @@ func TestRecycleSync(t *testing.T) {
// recycler simulates one recycle() call that succeeds.
wrapTestWithReclaimCalls(operationRecycle, []error{nil}, testSyncVolume),
},
{
// volume is used by a completed pod, pod using claim with the same name bound to different pv is running, should recycle
"6-14 - seemingly used by running pod",
newVolumeArray("volume6-14", "1Gi", "uid6-14", "completedClaim", v1.VolumeBound, v1.PersistentVolumeReclaimRecycle, classEmpty, annBoundByController),
newVolumeArray("volume6-14", "1Gi", "", "", v1.VolumeAvailable, v1.PersistentVolumeReclaimRecycle, classEmpty),
newClaimArray("completedClaim", "uid6-14-x", "10Gi", "", v1.ClaimBound, nil),
newClaimArray("completedClaim", "uid6-14-x", "10Gi", "", v1.ClaimBound, nil),
noevents, noerrors,
wrapTestWithReclaimCalls(operationRecycle, []error{nil}, testSyncVolume),
},
}
runSyncTests(t, tests, []*storage.StorageClass{}, pods)
}
Expand Down