github/containerized-data-importer
7
0
Fork 0
mirror of https://github.com/kubevirt/containerized-data-importer.git synced 2025-06-03 06:30:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clone sometimes doesn't add k8s.io/CloneOf annotation to target PVC #560

Browse Source 
Signed-off-by: tavni <tavni@redhat.com>
This commit is contained in:
tavni 2018-12-17 16:04:16 +02:00
parent a24846e702
commit df418652f7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/clone-controller.go
View File

@ -96,6 +96,7 @@ func (cc *CloneController) processPvcItem(pvc *v1.PersistentVolumeClaim) error {
if err != nil { if err != nil {
return err return err
} }
pvcKey, err := cache.MetaNamespaceKeyFunc(pvc) pvcKey, err := cache.MetaNamespaceKeyFunc(pvc)
if err != nil { if err != nil {
return err return err
@ -158,7 +159,6 @@ func (cc *CloneController) processPvcItem(pvc *v1.PersistentVolumeClaim) error {
//add the following annotation only if the pod pahse is succeeded, meaning job is completed //add the following annotation only if the pod pahse is succeeded, meaning job is completed
if phase == string(v1.PodSucceeded) { if phase == string(v1.PodSucceeded) {
anno[AnnCloneOf] = "true" anno[AnnCloneOf] = "true"
defer cc.deleteClonePods(sourcePod.Namespace, sourcePod.Name, targetPod.Name)
} }
var lab map[string]string var lab map[string]string
if !checkIfLabelExists(pvc, common.CDILabelKey, common.CDILabelValue) { if !checkIfLabelExists(pvc, common.CDILabelKey, common.CDILabelValue) {
@ -167,6 +167,8 @@ func (cc *CloneController) processPvcItem(pvc *v1.PersistentVolumeClaim) error {
pvc, err = updatePVC(cc.clientset, pvc, anno, lab) pvc, err = updatePVC(cc.clientset, pvc, anno, lab)
if err != nil { if err != nil {
return errors.WithMessage(err, "could not update pvc %q annotation and/or label") return errors.WithMessage(err, "could not update pvc %q annotation and/or label")
} else if pvc.Annotations[AnnCloneOf] == "true" {
cc.deleteClonePods(sourcePod.Namespace, sourcePod.Name, targetPod.Name)
} }
return nil return nil
} }