From 2b59a6c0c2cc78ad538d70b1a5185b147f5206f3 Mon Sep 17 00:00:00 2001 From: vinllen Date: Wed, 8 May 2019 19:43:59 +0800 Subject: [PATCH 1/2] polish --- ChangeLog | 2 +- conf/redis-shake.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea26ce2..0d0e968 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2019-04-21 Alibaba Cloud. +2019-05-08 Alibaba Cloud. * VERSION: 1.6.0 * FEATURE: source address supports cluster. * FEATURE: target address supports several proxies to write data in diff --git a/conf/redis-shake.conf b/conf/redis-shake.conf index a57a1d0..d494a04 100644 --- a/conf/redis-shake.conf +++ b/conf/redis-shake.conf @@ -70,7 +70,7 @@ rdb.input = local # ${output_rdb}.0, ${output_rdb}.1, ${output_rdb}.2 rdb.output = local_dump # the concurrence of fetching data, default is len(source.address) or len(rdb.input). -# used in `dump`, `sync` and `restore`. +# used in `dump`, `sync` and `restore`. 0 means default. # 拉取的并发度，如果是`dump`或者`sync`，默认是source.address中db的个数，`restore`模式默认len(rdb.input)。 # 假如db节点/输入的rdb有5个，但rdb.parallel=3，那么一次只会 # 并发拉取3个db的全量数据，直到某个db的rdb拉取完毕，才会拉取第4个db节点的rdb，以此类推。 From 460f740e21426a1f08004319d2569f0780fc108d Mon Sep 17 00:00:00 2001 From: vinllen Date: Wed, 8 May 2019 19:50:23 +0800 Subject: [PATCH 2/2] polish READM again --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d77f3c8..67abac6 100644 --- a/README.md +++ b/README.md @@ -39,9 +39,9 @@ m # Redis Type --- -Both the source and target type can be single redis, master-slave architecture redis, redis cluster and codis. Although the architecture patterns of different vendors are different for the cluster architecture, we still support different cloud vendors like alibaba-cloud, tencent-cloud and so on.
-If the target is open source redis cluster, redis-shake uses [redis-go-cluster](https://github.com/chasex/redis-go-cluster) driver to write data, otherwise, [redigo](https://github.com/garyburd/redigo) driver is used to insert data in round robin way.
-If the source is redis cluster, redis-shake launches multiple goroutines for parallel pull. User can control the concurrency.
+Both the source and target type can be standalone, opensource cluster and proxy. Although the architecture patterns of different vendors are different for the cluster architecture, we still support different cloud vendors like alibaba-cloud, tencent-cloud and so on.
+If the target is open source redis cluster, redis-shake uses [redis-go-cluster](https://github.com/chasex/redis-go-cluster) driver to write data. When target type is proxy, redis-shakes write data in round-robin way.
+If the source is redis cluster, redis-shake launches multiple goroutines for parallel pull. User can use `rdb.parallel` to control the RDB syncing concurrency.
The "move slot" operations must be disabled on the source side.
# Code branch rules