github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Svc REST: Make transaction-accumulating funcs safe

Browse Source 
Identified in review, these funcs are now more reslient to future
changes.
This commit is contained in:
Tim Hockin 2021-09-10 21:40:22 -07:00
parent e594dd4281
commit 009aa36c89
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/registry/core/service/storage/alloc.go
View File

@ -62,6 +62,13 @@ func makeAlloc(defaultFamily api.IPFamily, ipAllocs map[api.IPFamily]ipallocator
func (al *Allocators) allocateCreate(service *api.Service, dryRun bool) (transaction, error) { func (al *Allocators) allocateCreate(service *api.Service, dryRun bool) (transaction, error) {
result := metaTransaction{} result := metaTransaction{}
success := false
defer func() {
if !success {
result.Revert()
}
}()
// Ensure IP family fields are correctly initialized. We do it here, since // Ensure IP family fields are correctly initialized. We do it here, since
// we want this to be visible even when dryRun == true. // we want this to be visible even when dryRun == true.
@ -74,7 +81,6 @@ func (al *Allocators) allocateCreate(service *api.Service, dryRun bool) (transac
//does (and is tested!). Fixing that all is a big PR and will have to //does (and is tested!). Fixing that all is a big PR and will have to
//happen later. //happen later.
if txn, err := al.txnAllocClusterIPs(service, dryRun); err != nil { if txn, err := al.txnAllocClusterIPs(service, dryRun); err != nil {
result.Revert()
return nil, err return nil, err
} else { } else {
result = append(result, txn) result = append(result, txn)
@ -82,12 +88,12 @@ func (al *Allocators) allocateCreate(service *api.Service, dryRun bool) (transac
// Allocate ports // Allocate ports
if txn, err := al.txnAllocNodePorts(service, dryRun); err != nil { if txn, err := al.txnAllocNodePorts(service, dryRun); err != nil {
result.Revert()
return nil, err return nil, err
} else { } else {
result = append(result, txn) result = append(result, txn)
} }
success = true
return result, nil return result, nil
} }
@ -569,6 +575,13 @@ func (al *Allocators) allocHealthCheckNodePort(service *api.Service, nodePortOp
func (al *Allocators) allocateUpdate(after After, before Before, dryRun bool) (transaction, error) { func (al *Allocators) allocateUpdate(after After, before Before, dryRun bool) (transaction, error) {
result := metaTransaction{} result := metaTransaction{}
success := false
defer func() {
if !success {
result.Revert()
}
}()
// Ensure IP family fields are correctly initialized. We do it here, since // Ensure IP family fields are correctly initialized. We do it here, since
// we want this to be visible even when dryRun == true. // we want this to be visible even when dryRun == true.
@ -581,7 +594,6 @@ func (al *Allocators) allocateUpdate(after After, before Before, dryRun bool) (t
//does (and is tested!). Fixing that all is a big PR and will have to //does (and is tested!). Fixing that all is a big PR and will have to
//happen later. //happen later.
if txn, err := al.txnUpdateClusterIPs(after, before, dryRun); err != nil { if txn, err := al.txnUpdateClusterIPs(after, before, dryRun); err != nil {
result.Revert()
return nil, err return nil, err
} else { } else {
result = append(result, txn) result = append(result, txn)
@ -589,12 +601,12 @@ func (al *Allocators) allocateUpdate(after After, before Before, dryRun bool) (t
// Allocate ports // Allocate ports
if txn, err := al.txnUpdateNodePorts(after, before, dryRun); err != nil { if txn, err := al.txnUpdateNodePorts(after, before, dryRun); err != nil {
result.Revert()
return nil, err return nil, err
} else { } else {
result = append(result, txn) result = append(result, txn)
} }
success = true
return result, nil return result, nil
} }