beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libnetwork/datastore: remove redundant datastore.sequential

Browse source 
The sequential field determined whether a lock was needed when storing
and retrieving data. This field was always set to true, with the exception
of NewTestDataStore() in the tests.

This field was added in a18e2f9965
to make locking optional for non-local scoped stores. Such stores are no
longer used, so we can remove this field.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-07-02 15:21:03 +02:00
parent e9b6965079
commit 824abbf8d9
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 21 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
libnetwork/datastore/datastore.go
View file

@ -54,11 +54,10 @@ var (
) )
type datastore struct { type datastore struct {
scope string scope string
store store.Store store store.Store
cache *cache cache *cache
watchCh chan struct{} watchCh chan struct{}
sequential bool
sync.Mutex sync.Mutex
} }
@ -207,7 +206,7 @@ func newClient(kv string, addr string, config *store.Config) (DataStore, error)
return nil, err return nil, err
} }
ds := &datastore{scope: LocalScope, store: s, watchCh: make(chan struct{}), sequential: true} ds := &datastore{scope: LocalScope, store: s, watchCh: make(chan struct{})}
ds.cache = newCache(ds) ds.cache = newCache(ds)
return ds, nil return ds, nil
@ -346,10 +345,8 @@ func (ds *datastore) PutObjectAtomic(kvObject KVObject) error {
pair *store.KVPair pair *store.KVPair
err error err error
) )
if ds.sequential { ds.Lock()
ds.Lock() defer ds.Unlock()
defer ds.Unlock()
}
if kvObject == nil { if kvObject == nil {
return types.BadRequestErrorf("invalid KV Object : nil") return types.BadRequestErrorf("invalid KV Object : nil")
@ -393,10 +390,8 @@ add_cache:
// PutObject adds a new Record based on an object into the datastore // PutObject adds a new Record based on an object into the datastore
func (ds *datastore) PutObject(kvObject KVObject) error { func (ds *datastore) PutObject(kvObject KVObject) error {
if ds.sequential { ds.Lock()
ds.Lock() defer ds.Unlock()
defer ds.Unlock()
}
if kvObject == nil { if kvObject == nil {
return types.BadRequestErrorf("invalid KV Object : nil") return types.BadRequestErrorf("invalid KV Object : nil")
@ -431,10 +426,8 @@ func (ds *datastore) putObjectWithKey(kvObject KVObject, key ...string) error {
// GetObject returns a record matching the key // GetObject returns a record matching the key
func (ds *datastore) GetObject(key string, o KVObject) error { func (ds *datastore) GetObject(key string, o KVObject) error {
if ds.sequential { ds.Lock()
ds.Lock() defer ds.Unlock()
defer ds.Unlock()
}
if ds.cache != nil { if ds.cache != nil {
return ds.cache.get(key, o) return ds.cache.get(key, o)
@ -467,10 +460,8 @@ func (ds *datastore) ensureParent(parent string) error {
} }
func (ds *datastore) List(key string, kvObject KVObject) ([]KVObject, error) { func (ds *datastore) List(key string, kvObject KVObject) ([]KVObject, error) {
if ds.sequential { ds.Lock()
ds.Lock() defer ds.Unlock()
defer ds.Unlock()
}
if ds.cache != nil { if ds.cache != nil {
return ds.cache.list(kvObject) return ds.cache.list(kvObject)
@ -524,10 +515,8 @@ func (ds *datastore) iterateKVPairsFromStore(key string, kvObject KVObject, call
} }
func (ds *datastore) Map(key string, kvObject KVObject) (map[string]KVObject, error) { func (ds *datastore) Map(key string, kvObject KVObject) (map[string]KVObject, error) {
if ds.sequential { ds.Lock()
ds.Lock() defer ds.Unlock()
defer ds.Unlock()
}
kvol := make(map[string]KVObject) kvol := make(map[string]KVObject)
cb := func(key string, val KVObject) { cb := func(key string, val KVObject) {
@ -543,10 +532,8 @@ func (ds *datastore) Map(key string, kvObject KVObject) (map[string]KVObject, er
// DeleteObject unconditionally deletes a record from the store // DeleteObject unconditionally deletes a record from the store
func (ds *datastore) DeleteObject(kvObject KVObject) error { func (ds *datastore) DeleteObject(kvObject KVObject) error {
if ds.sequential { ds.Lock()
ds.Lock() defer ds.Unlock()
defer ds.Unlock()
}
// cleanup the cache first // cleanup the cache first
if ds.cache != nil { if ds.cache != nil {
@ -564,10 +551,8 @@ func (ds *datastore) DeleteObject(kvObject KVObject) error {
// DeleteObjectAtomic performs atomic delete on a record // DeleteObjectAtomic performs atomic delete on a record
func (ds *datastore) DeleteObjectAtomic(kvObject KVObject) error { func (ds *datastore) DeleteObjectAtomic(kvObject KVObject) error {
if ds.sequential { ds.Lock()
ds.Lock() defer ds.Unlock()
defer ds.Unlock()
}
if kvObject == nil { if kvObject == nil {
return types.BadRequestErrorf("invalid KV Object : nil") return types.BadRequestErrorf("invalid KV Object : nil")
@ -599,10 +584,8 @@ del_cache:
// DeleteTree unconditionally deletes a record from the store // DeleteTree unconditionally deletes a record from the store
func (ds *datastore) DeleteTree(kvObject KVObject) error { func (ds *datastore) DeleteTree(kvObject KVObject) error {
if ds.sequential { ds.Lock()
ds.Lock() defer ds.Unlock()
defer ds.Unlock()
}
// cleanup the cache first // cleanup the cache first
if ds.cache != nil { if ds.cache != nil {