kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Vendoring in libkv to be aligned with libnetwork

Browse source 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
This commit is contained in:
Madhu Venugopal 2015-10-22 14:12:04 -07:00
parent 52df87ac2b
commit 793b20ba09
5 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hack/vendor.sh
View file

@ -26,7 +26,7 @@ clone git github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec
clone git github.com/hashicorp/go-msgpack 71c2886f5a673a35f909803f38ece5810165097b clone git github.com/hashicorp/go-msgpack 71c2886f5a673a35f909803f38ece5810165097b
clone git github.com/hashicorp/memberlist 9a1e242e454d2443df330bdd51a436d5a9058fc4 clone git github.com/hashicorp/memberlist 9a1e242e454d2443df330bdd51a436d5a9058fc4
clone git github.com/hashicorp/serf 7151adcef72687bf95f451a2e0ba15cb19412bf2 clone git github.com/hashicorp/serf 7151adcef72687bf95f451a2e0ba15cb19412bf2
clone git github.com/docker/libkv 749af6c5b3fb755bec1738cc5e0d3a6f1574d730 clone git github.com/docker/libkv c2aac5dbbaa5c872211edea7c0f32b3bd67e7410
clone git github.com/vishvananda/netns 604eaf189ee867d8c147fafc28def2394e878d25 clone git github.com/vishvananda/netns 604eaf189ee867d8c147fafc28def2394e878d25
clone git github.com/vishvananda/netlink 4b5dce31de6d42af5bb9811c6d265472199e0fec clone git github.com/vishvananda/netlink 4b5dce31de6d42af5bb9811c6d265472199e0fec
clone git github.com/BurntSushi/toml f706d00e3de6abe700c994cdd545a1a4915af060 clone git github.com/BurntSushi/toml f706d00e3de6abe700c994cdd545a1a4915af060

3
vendor/src/github.com/docker/libkv/store/boltdb/boltdb.go vendored
View file

@ -330,6 +330,9 @@ func (b *BoltDB) AtomicDelete(key string, previous *store.KVPair) (bool, error)
} }
val = bucket.Get([]byte(key)) val = bucket.Get([]byte(key))
if val == nil {
return store.ErrKeyNotFound
}
dbIndex := binary.LittleEndian.Uint64(val[:libkvmetadatalen]) dbIndex := binary.LittleEndian.Uint64(val[:libkvmetadatalen])
if dbIndex != previous.LastIndex { if dbIndex != previous.LastIndex {
return store.ErrKeyModified return store.ErrKeyModified

7
vendor/src/github.com/docker/libkv/store/consul/consul.go vendored
View file

@ -467,6 +467,13 @@ func (s *Consul) AtomicDelete(key string, previous *store.KVPair) (bool, error)
} }
p := &api.KVPair{Key: s.normalize(key), ModifyIndex: previous.LastIndex} p := &api.KVPair{Key: s.normalize(key), ModifyIndex: previous.LastIndex}
// Extra Get operation to check on the key
_, err := s.Get(key)
if err != nil && err == store.ErrKeyNotFound {
return false, err
}
if work, _, err := s.client.KV().DeleteCAS(p, nil); err != nil { if work, _, err := s.client.KV().DeleteCAS(p, nil); err != nil {
return false, err return false, err
} else if !work { } else if !work {

4
vendor/src/github.com/docker/libkv/store/etcd/etcd.go vendored
View file

@ -368,6 +368,10 @@ func (s *Etcd) AtomicDelete(key string, previous *store.KVPair) (bool, error) {
_, err := s.client.Delete(context.Background(), s.normalize(key), delOpts) _, err := s.client.Delete(context.Background(), s.normalize(key), delOpts)
if err != nil { if err != nil {
if etcdError, ok := err.(etcd.Error); ok { if etcdError, ok := err.(etcd.Error); ok {
// Key Not Found
if etcdError.Code == etcd.ErrorCodeKeyNotFound {
return false, store.ErrKeyNotFound
}
// Compare failed // Compare failed
if etcdError.Code == etcd.ErrorCodeTestFailed { if etcdError.Code == etcd.ErrorCodeTestFailed {
return false, store.ErrKeyModified return false, store.ErrKeyModified

6
vendor/src/github.com/docker/libkv/store/zookeeper/zookeeper.go vendored
View file

@ -347,9 +347,15 @@ func (s *Zookeeper) AtomicDelete(key string, previous *store.KVPair) (bool, erro
err := s.client.Delete(s.normalize(key), int32(previous.LastIndex)) err := s.client.Delete(s.normalize(key), int32(previous.LastIndex))
if err != nil { if err != nil {
// Key not found
if err == zk.ErrNoNode {
return false, store.ErrKeyNotFound
}
// Compare failed
if err == zk.ErrBadVersion { if err == zk.ErrBadVersion {
return false, store.ErrKeyModified return false, store.ErrKeyModified
} }
// General store error
return false, err return false, err
} }
return true, nil return true, nil