From 68c8f730705d142dce1c96e9eea7ecd8b1efbcd8 Mon Sep 17 00:00:00 2001 From: Huachao Huang Date: Fri, 4 Nov 2016 20:11:29 +0800 Subject: [PATCH] store/tikv: address comment --- store/tikv/kv.go | 2 +- store/tikv/lock_resolver.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/store/tikv/kv.go b/store/tikv/kv.go index 89b7f4fedd..5c8e5312ec 100644 --- a/store/tikv/kv.go +++ b/store/tikv/kv.go @@ -60,7 +60,7 @@ func (d Driver) Open(path string) (kv.Storage, error) { } // FIXME: uuid will be a very long and ugly string, simplify it. - uuid := fmt.Sprintf("tikv-%v", etcdAddrs) + uuid := fmt.Sprintf("tikv-%v", pdCli.GetClusterID()) if store, ok := mc.cache[uuid]; ok { return store, nil } diff --git a/store/tikv/lock_resolver.go b/store/tikv/lock_resolver.go index c91dcc9f0e..36ac91d6d7 100644 --- a/store/tikv/lock_resolver.go +++ b/store/tikv/lock_resolver.go @@ -51,7 +51,7 @@ func NewLockResolver(etcdAddrs []string) (*LockResolver, error) { if err != nil { return nil, errors.Trace(err) } - uuid := fmt.Sprintf("tikv-%v", etcdAddrs) + uuid := fmt.Sprintf("tikv-%v", pdCli.GetClusterID()) s, err := newTikvStore(uuid, &codecPDClient{pdCli}, newRPCClient(), false) if err != nil { return nil, errors.Trace(err)