Forráskód Böngészése

Merge pull request #646 from coolljt0725/fix_cluster_store

Fix docker daemon failed to start with multiple cluster store address
Jana Radhakrishnan 9 éve
szülő
commit
d834cd42b2
1 módosított fájl, 5 hozzáadás és 2 törlés
  1. 5 2
      libnetwork/datastore/datastore.go

+ 5 - 2
libnetwork/datastore/datastore.go

@@ -188,7 +188,7 @@ func ParseKey(key string) ([]string, error) {
 }
 
 // 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 {
 		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 {
 		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 {
 		return nil, err
 	}