release 1.7-unstable v1

conf/redis-shake.conf

@@ -6,7 +6,7 @@ id = redis-shake
 
 # log file，日志文件，不配置将打印到stdout (e.g. /var/log/redis-shake.log )
 log.file =
-# log level: "none", "error", "warn", "info", "debug", "all". default is "info". "debug" == "all"
+# log level: "none", "error", "warn", "info", "debug". default is "info".
 log.level = info
 # pid path，进程文件存储地址（e.g. /var/run/)，不配置将默认输出到执行下面,
 # 注意这个是目录，真正的pid是`{pid_path}/{id}.pid`

src/integration-test/subCase/subCase.go

@@ -52,6 +52,7 @@ func GenerateShakeConf(sourcePort, targetPort int, filterKeyBlack, filterKeyWhit
     mp["id"] = "redis-shake-integration"
     mp["log.file"] = "redis-shake-integration.log"
     mp["http_profile"] = "9320"
+    mp["rewrite"] = true
 
     if resumeBreakpoint {
     	mp["resume_from_break_point"] = true
@@ -176,6 +177,8 @@ func (sc *SubCase) startShake() error {
 		return fmt.Errorf("inject data 1th failed[%v]", err)
 	}
 
+	time.Sleep(10 * time.Second)
+
 	// 2.1: start shake
 	if err := deploy.StartShake(sc.shakeDir, sc.runDir, sc.shakeConf, "sync"); err != nil {
 		return fmt.Errorf("start redis-shake 2th failed[%v]", err)

src/integration-test/tcase/standalone2standalone.go

@@ -49,7 +49,7 @@ func (s2s *Standalone2StandaloneCase) Run() error {
 		targetConn := shakeUtils.OpenRedisConn([]string{fmt.Sprintf(":%d", s2s.TargetPort)}, "auth", "", false, false)
 
 		sc := subCase.NewSubCase(sourceConn, targetConn, s2s.SourcePort, s2s.TargetPort, nil, nil,
-			nil, nil, "", true)
+			nil, nil, "", false)
 		log.Info("run")
 		sc.Run()
 	}