mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Fix docker daemon failed to start with multiple cluster store address
Signed-off-by: Lei Jitang <leijitang@huawei.com>
This commit is contained in:
parent
a9d95c3b70
commit
82e3c49b0a
1 changed files with 5 additions and 2 deletions
|
@ -188,7 +188,7 @@ func ParseKey(key string) ([]string, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// newClient used to connect to KV Store
|
// newClient used to connect to KV Store
|
||||||
func newClient(scope string, kv string, addrs string, config *store.Config, cached bool) (DataStore, error) {
|
func newClient(scope string, kv string, addr string, config *store.Config, cached bool) (DataStore, error) {
|
||||||
if cached && scope != LocalScope {
|
if cached && scope != LocalScope {
|
||||||
return nil, fmt.Errorf("caching supported only for scope %s", LocalScope)
|
return nil, fmt.Errorf("caching supported only for scope %s", LocalScope)
|
||||||
}
|
}
|
||||||
|
@ -196,7 +196,10 @@ func newClient(scope string, kv string, addrs string, config *store.Config, cach
|
||||||
if config == nil {
|
if config == nil {
|
||||||
config = &store.Config{}
|
config = &store.Config{}
|
||||||
}
|
}
|
||||||
store, err := libkv.NewStore(store.Backend(kv), []string{addrs}, config)
|
|
||||||
|
addrs := strings.Split(addr, ",")
|
||||||
|
|
||||||
|
store, err := libkv.NewStore(store.Backend(kv), addrs, config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue