From 467333cc402985f1af9b355cd432d08429d31342 Mon Sep 17 00:00:00 2001 From: Anirudh Date: Tue, 12 Jul 2016 23:34:28 -0700 Subject: [PATCH] Create event only if creation of PVC failed. --- pkg/controller/petset/pet.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/controller/petset/pet.go b/pkg/controller/petset/pet.go index 42e2555e5d0..65c4816bc9c 100644 --- a/pkg/controller/petset/pet.go +++ b/pkg/controller/petset/pet.go @@ -231,7 +231,9 @@ func (p *apiServerPetClient) getPVC(pvcName, pvcNamespace string) (*api.Persiste if errors.IsNotFound(err) { found = false } - if err != nil || !found { + if !found { + return nil, found, nil + } else if err != nil { return nil, found, err } return pvc, true, nil @@ -249,7 +251,8 @@ func (p *apiServerPetClient) SyncPVCs(pet *pcb) error { for i, pvc := range pet.pvcs { _, exists, err := p.getPVC(pvc.Name, pet.parent.Namespace) if !exists { - if err := p.createPVC(&pet.pvcs[i]); err != nil { + var err error + if err = p.createPVC(&pet.pvcs[i]); err != nil { errMsg += fmt.Sprintf("Failed to create %v: %v", pvc.Name, err) } p.event(pet.parent, "Create", fmt.Sprintf("pvc: %v", pvc.Name), err)