From 166a2f0fa3a426d5316237e24c60de37df8d34ec Mon Sep 17 00:00:00 2001 From: vinllen Date: Thu, 11 Apr 2019 14:45:53 +0800 Subject: [PATCH] polish log --- src/redis-shake/common/utils.go | 1 - src/redis-shake/sync.go | 9 ++++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/redis-shake/common/utils.go b/src/redis-shake/common/utils.go index e4b30df..2d52fea 100644 --- a/src/redis-shake/common/utils.go +++ b/src/redis-shake/common/utils.go @@ -84,7 +84,6 @@ func OpenReadWriteFile(name string) *os.File { } func SendPSyncListeningPort(c net.Conn, port int) { - _, err := c.Write(redis.MustEncodeToBytes(redis.NewCommand("replconf", "listening-port", port))) if err != nil { log.PanicError(errors.Trace(err), "write replconf listening-port failed") diff --git a/src/redis-shake/sync.go b/src/redis-shake/sync.go index 6521d90..acf139e 100644 --- a/src/redis-shake/sync.go +++ b/src/redis-shake/sync.go @@ -100,10 +100,8 @@ func (cmd *CmdSync) Main() { log.Panic("invalid argument: target") } - log.Infof("sync from '%s' to '%s' http '%d'\n", from, target, conf.Options.HttpProfile) - + log.Infof("sync from '%s' to '%s' with http-port[%d]\n", from, target, conf.Options.HttpProfile) cmd.wait_full = make(chan struct{}) - log.Infof("sync from '%s' to '%s'\n", from, target) var sockfile *os.File if len(conf.Options.SockFileName) != 0 { @@ -172,10 +170,15 @@ func (cmd *CmdSync) SendSyncCmd(master, auth_type, passwd string) (net.Conn, int func (cmd *CmdSync) SendPSyncCmd(master, auth_type, passwd string) (pipe.Reader, int64) { c := utils.OpenNetConn(master, auth_type, passwd) + log.Infof("psync connect '%v' with auth type[%v] OK!", master, auth_type) + utils.SendPSyncListeningPort(c, conf.Options.HttpProfile) + log.Infof("psync send listening port[%v] OK!", conf.Options.HttpProfile) + br := bufio.NewReaderSize(c, utils.ReaderBufferSize) bw := bufio.NewWriterSize(c, utils.WriterBufferSize) + log.Infof("try to send 'psync' command") runid, offset, wait := utils.SendPSyncFullsync(br, bw) cmd.targetOffset.Set(offset) log.Infof("psync runid = %s offset = %d, fullsync", runid, offset)