scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31944 from m1093782566/m109-master-fix-found

Browse Source 
Automatic merge from submit-queue

[Pet Set] Clean up code

<!--  Thanks for sending a pull request!  Here are some tips for you:
1. If this is your first time, read our contributor guidelines https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md and developer guide https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md
2. If you want *faster* PR reviews, read how: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/faster_reviews.md
3. Follow the instructions for writing a release note: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes
-->

**What this PR does / why we need it**:

Clean code of petset, from:

```
func (p *apiServerPetClient) getPVC(pvcName, pvcNamespace string) (*api.PersistentVolumeClaim, bool, error)
```

to:

```
func (p *apiServerPetClient) getPVC(pvcName, pvcNamespace string) (*api.PersistentVolumeClaim, error) 
```

I think the 2nd(bool type) return value of [getPVC](https://github.com/kubernetes/kubernetes/blob/master/pkg/controller/petset/pet.go#L228) is unnecessary, as the caller can be responsible for checking the error type and tell if it exists via the [error type](https://github.com/kubernetes/kubernetes/blob/master/pkg/controller/petset/pet.go#L231-L233).

So, I remove the 2nd return value of `getPVC()`.

The benefit of this change is that we can simplify the code of `getPVC()` while don't increase the caller's code.
This commit is contained in:
Kubernetes Submit Queue
2016-09-09 15:00:22 -07:00
committed by GitHub
parent 9d06efb2d1 7dd675ef32
commit a69752c81f
2 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/controller/petset/fakes.go
View File

@@ -151,11 +151,13 @@ func newFakePetClient() *fakePetClient {
} }
type fakePetClient struct { type fakePetClient struct {
pets []*pcb pets []*pcb
claims []api.PersistentVolumeClaim claims []api.PersistentVolumeClaim
petsCreated, petsDeleted int petsCreated int
claimsCreated, claimsDeleted int petsDeleted int
recorder record.EventRecorder claimsCreated int
claimsDeleted int
recorder record.EventRecorder
petHealthChecker petHealthChecker
} }

37
pkg/controller/petset/pet.go
View File

@@ -225,18 +225,9 @@ func (p *apiServerPetClient) DeletePVCs(pet *pcb) error {
return nil return nil
} }
func (p *apiServerPetClient) getPVC(pvcName, pvcNamespace string) (*api.PersistentVolumeClaim, bool, error) { func (p *apiServerPetClient) getPVC(pvcName, pvcNamespace string) (*api.PersistentVolumeClaim, error) {
found := true
pvc, err := claimClient(p.c, pvcNamespace).Get(pvcName) pvc, err := claimClient(p.c, pvcNamespace).Get(pvcName)
if errors.IsNotFound(err) { return pvc, err
found = false
}
if !found {
return nil, found, nil
} else if err != nil {
return nil, found, err
}
return pvc, true, nil
} }
func (p *apiServerPetClient) createPVC(pvc *api.PersistentVolumeClaim) error { 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. // SyncPVCs syncs pvcs in the given pcb.
func (p *apiServerPetClient) SyncPVCs(pet *pcb) error { func (p *apiServerPetClient) SyncPVCs(pet *pcb) error {
errMsg := "" errmsg := ""
// Create new claims. // Create new claims.
for i, pvc := range pet.pvcs { for i, pvc := range pet.pvcs {
_, exists, err := p.getPVC(pvc.Name, pet.parent.Namespace) _, err := p.getPVC(pvc.Name, pet.parent.Namespace)
if !exists { if err != nil {
var err error if errors.IsNotFound(err) {
if err = p.createPVC(&pet.pvcs[i]); err != nil { var err error
errMsg += fmt.Sprintf("Failed to create %v: %v", pvc.Name, err) 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 // TODO: Check resource requirements and accessmodes, update if necessary
} }
if len(errMsg) != 0 { if len(errmsg) != 0 {
return fmt.Errorf("%v", errMsg) return fmt.Errorf("%v", errmsg)
} }
return nil return nil
} }