mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-18 02:50:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: remove deleteLock while we acquire clone operation lock

Browse Source 
clone controller make sure there is no delete operation happens
on the source PVC which has been referred as the datasource of
clone PVC, we are safe to operate without looking at delete
operation lock in this case.

Subjected code in the controller:

...
if claim.Spec.DataSource != nil && rc.clone {
		err = p.setCloneFinalizer(ctx, claim)
		...
}

if !checkFinalizer(claim, pvcCloneFinalizer) {
		claim.Finalizers = append(claim.Finalizers, pvcCloneFinalizer)
		_, err := p.client.CoreV1().PersistentVolumeClaims(claim.Namespace).Update(..claim..)
	}

Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
This commit is contained in:
Humble Chirammal 2021-07-13 21:24:21 +05:30 committed by mergify[bot]
parent e088e8fd2e
commit 94c5c5e119
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/util/idlocker.go
View File

@ -119,15 +119,11 @@ func (ol *OperationLock) tryAcquire(op operation, volumeID string) error {
val := ol.locks[createOp][volumeID] val := ol.locks[createOp][volumeID]
ol.locks[createOp][volumeID] = val + 1 ol.locks[createOp][volumeID] = val + 1
case cloneOpt: case cloneOpt:
// During clone operation we need to check any ongoing delete,expand // During clone operation, controller make sure no pvc deletion happens on the
// operation. if yes we need to return an error to avoid issues. // referred PVC datasource, so we are safe from source PVC delete.
// check any delete operation is going on for given volume ID // Check any expand operation is going on for given volume ID.
if _, ok := ol.locks[deleteOp][volumeID]; ok { // if yes we need to return an error to avoid issues.
return fmt.Errorf("a Delete operation with given id %s already exists", volumeID)
}
// check any expand operation is going on for given volume ID
if _, ok := ol.locks[expandOp][volumeID]; ok { if _, ok := ol.locks[expandOp][volumeID]; ok {
return fmt.Errorf("an Expand operation with given id %s already exists", volumeID) return fmt.Errorf("an Expand operation with given id %s already exists", volumeID)
} }