github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

use atomic create in EtcdHelper.AtomicUpdate

Browse Source
This commit is contained in:
Kouhei Ueno 2014-07-30 19:05:10 +09:00
parent b3e5f40988
commit 3f9ec452e4
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/tools/etcd_tools.go
View File

@ -92,6 +92,11 @@ func IsEtcdTestFailed(err error) bool {
return isEtcdErrorNum(err, EtcdErrorCodeTestFailed) return isEtcdErrorNum(err, EtcdErrorCodeTestFailed)
} }
// IsEtcdNodeExist returns true iff err is an etcd node aleady exist error.
func IsEtcdNodeExist(err error) bool {
return isEtcdErrorNum(err, EtcdErrorCodeNodeExist)
}
// IsEtcdWatchStoppedByUser returns true iff err is a client triggered stop. // IsEtcdWatchStoppedByUser returns true iff err is a client triggered stop.
func IsEtcdWatchStoppedByUser(err error) bool { func IsEtcdWatchStoppedByUser(err error) bool {
return etcd.ErrWatchStoppedByUser == err return etcd.ErrWatchStoppedByUser == err
@ -232,15 +237,20 @@ func (h *EtcdHelper) AtomicUpdate(key string, ptrToType interface{}, tryUpdate E
return err return err
} }
// First time this key has been used, just set.
if index == 0 {
return h.SetObj(key, ret)
}
data, err := h.Encoding.Encode(ret) data, err := h.Encoding.Encode(ret)
if err != nil { if err != nil {
return err return err
} }
// First time this key has been used, try creating new value.
if index == 0 {
_, err = h.Client.Create(key, string(data), 0)
if IsEtcdNodeExist(err) {
continue
}
return err
}
_, err = h.Client.CompareAndSwap(key, string(data), 0, origBody, index) _, err = h.Client.CompareAndSwap(key, string(data), 0, origBody, index)
if IsEtcdTestFailed(err) { if IsEtcdTestFailed(err) {
continue continue