From dd0d244ff700a7f9699696410dacbf4991c358a9 Mon Sep 17 00:00:00 2001 From: vinllen Date: Wed, 4 Sep 2019 15:03:53 +0800 Subject: [PATCH 1/3] cluster restore quick list panic --- src/redis-shake/common/cluster.go | 5 +++++ src/vendor/vendor.json | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/redis-shake/common/cluster.go b/src/redis-shake/common/cluster.go index 2abb1e7..870388e 100644 --- a/src/redis-shake/common/cluster.go +++ b/src/redis-shake/common/cluster.go @@ -61,6 +61,11 @@ func (cc *ClusterConn) Send(commandName string, args ...interface{}) error { // send batcher and put the return into recvChan func (cc *ClusterConn) Flush() error { + if cc.batcher == nil { + log.Info("batcher is empty, no need to flush") + return nil + } + ret, err := cc.client.RunBatch(cc.batcher) defer func() { cc.batcher = nil // reset batcher diff --git a/src/vendor/vendor.json b/src/vendor/vendor.json index 1760128..5a3e3cb 100644 --- a/src/vendor/vendor.json +++ b/src/vendor/vendor.json @@ -159,10 +159,10 @@ "revisionTime": "2019-03-04T09:57:49Z" }, { - "checksumSHA1": "1PrwQi6VvhLG4ovw1B7zD/afGZ4=", + "checksumSHA1": "qW5Sb6hcZxGHxZbkLoHrCQtYyBs=", "path": "github.com/vinllen/redis-go-cluster", - "revision": "0799101ddfdb7d2bc9d47948f8a0cc17d23a216e", - "revisionTime": "2019-08-12T11:22:58Z" + "revision": "1883b18765aeed1a0b01320791dfe6103aa9a6b6", + "revisionTime": "2019-09-04T07:01:13Z" }, { "checksumSHA1": "TM3Neoy1xRAKyZYMGzKc41sDFW4=", From 865161be1a178a72b8a865eecc5b5575925b48aa Mon Sep 17 00:00:00 2001 From: vinllen Date: Wed, 4 Sep 2019 15:04:43 +0800 Subject: [PATCH 2/3] cluster restore quick list panic, see #156 --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index cf892b7..0ae6d6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2019-09-04 Alibaba Cloud. + * VERSION: 1.6.18 + * BUGFIX: restore quicklist panic when target is cluster. see #156 2019-08-27 Alibaba Cloud. * VERSION: 1.6.17 * BUGFIX: transaction syncing panic when target redis is cluster. see From 3fd94d9fc2ed27a32f4bea3bfe13a36e6e33fe73 Mon Sep 17 00:00:00 2001 From: vinllen Date: Wed, 4 Sep 2019 15:06:39 +0800 Subject: [PATCH 3/3] add contributor in README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d7cf427..4fe22b1 100644 --- a/README.md +++ b/README.md @@ -100,3 +100,4 @@ Plus, we have a WeChat group so that users can join and discuss, but the group u | ceshihao | davidzheng23@gmail.com | | wangyiyang | wangyiyang.kk@gmail.com | | muicoder | muicoder@gmail.com | +| zhklcf | huikangzhu@126.com |