From 7dd675ef32a1924a21425beaac19bd42ef7ebb6e Mon Sep 17 00:00:00 2001
From: m1093782566 <dj199008@gmail.com>
Date: Fri, 2 Sep 2016 11:02:18 +0800
Subject: [PATCH] clean up pet set code

Change-Id: I60562bb1aa44436a23cfc5e50d6037adcce417c6
---
 pkg/controller/petset/fakes.go | 12 ++++++-----
 pkg/controller/petset/pet.go   | 37 ++++++++++++++--------------------
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/pkg/controller/petset/fakes.go b/pkg/controller/petset/fakes.go
index a0f4b948fc5..8c366990a83 100644
--- a/pkg/controller/petset/fakes.go
+++ b/pkg/controller/petset/fakes.go
@@ -151,11 +151,13 @@ func newFakePetClient() *fakePetClient {
 }
 
 type fakePetClient struct {
-	pets                         []*pcb
-	claims                       []api.PersistentVolumeClaim
-	petsCreated, petsDeleted     int
-	claimsCreated, claimsDeleted int
-	recorder                     record.EventRecorder
+	pets          []*pcb
+	claims        []api.PersistentVolumeClaim
+	petsCreated   int
+	petsDeleted   int
+	claimsCreated int
+	claimsDeleted int
+	recorder      record.EventRecorder
 	petHealthChecker
 }
 
diff --git a/pkg/controller/petset/pet.go b/pkg/controller/petset/pet.go
index 65c4816bc9c..a74262efb72 100644
--- a/pkg/controller/petset/pet.go
+++ b/pkg/controller/petset/pet.go
@@ -225,18 +225,9 @@ func (p *apiServerPetClient) DeletePVCs(pet *pcb) error {
 	return nil
 }
 
-func (p *apiServerPetClient) getPVC(pvcName, pvcNamespace string) (*api.PersistentVolumeClaim, bool, error) {
-	found := true
+func (p *apiServerPetClient) getPVC(pvcName, pvcNamespace string) (*api.PersistentVolumeClaim, error) {
 	pvc, err := claimClient(p.c, pvcNamespace).Get(pvcName)
-	if errors.IsNotFound(err) {
-		found = false
-	}
-	if !found {
-		return nil, found, nil
-	} else if err != nil {
-		return nil, found, err
-	}
-	return pvc, true, nil
+	return pvc, err
 }
 
 func (p *apiServerPetClient) createPVC(pvc *api.PersistentVolumeClaim) error {
@@ -246,23 +237,25 @@ func (p *apiServerPetClient) createPVC(pvc *api.PersistentVolumeClaim) error {
 
 // SyncPVCs syncs pvcs in the given pcb.
 func (p *apiServerPetClient) SyncPVCs(pet *pcb) error {
-	errMsg := ""
+	errmsg := ""
 	// Create new claims.
 	for i, pvc := range pet.pvcs {
-		_, exists, err := p.getPVC(pvc.Name, pet.parent.Namespace)
-		if !exists {
-			var err error
-			if err = p.createPVC(&pet.pvcs[i]); err != nil {
-				errMsg += fmt.Sprintf("Failed to create %v: %v", pvc.Name, err)
+		_, err := p.getPVC(pvc.Name, pet.parent.Namespace)
+		if err != nil {
+			if errors.IsNotFound(err) {
+				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)
+			} else {
+				errmsg += fmt.Sprintf("Error trying to get pvc %v, %v.", pvc.Name, err)
 			}
-			p.event(pet.parent, "Create", fmt.Sprintf("pvc: %v", pvc.Name), err)
-		} else if err != nil {
-			errMsg += fmt.Sprintf("Error trying to get pvc %v, %v.", pvc.Name, err)
 		}
 		// TODO: Check resource requirements and accessmodes, update if necessary
 	}
-	if len(errMsg) != 0 {
-		return fmt.Errorf("%v", errMsg)
+	if len(errmsg) != 0 {
+		return fmt.Errorf("%v", errmsg)
 	}
 	return nil
 }