|
|
@ -100,10 +100,8 @@ func (cmd *CmdSync) Main() { |
|
|
|
log.Panic("invalid argument: target") |
|
|
|
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{}) |
|
|
|
cmd.wait_full = make(chan struct{}) |
|
|
|
log.Infof("sync from '%s' to '%s'\n", from, target) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var sockfile *os.File |
|
|
|
var sockfile *os.File |
|
|
|
if len(conf.Options.SockFileName) != 0 { |
|
|
|
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) { |
|
|
|
func (cmd *CmdSync) SendPSyncCmd(master, auth_type, passwd string) (pipe.Reader, int64) { |
|
|
|
c := utils.OpenNetConn(master, auth_type, passwd) |
|
|
|
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) |
|
|
|
utils.SendPSyncListeningPort(c, conf.Options.HttpProfile) |
|
|
|
|
|
|
|
log.Infof("psync send listening port[%v] OK!", conf.Options.HttpProfile) |
|
|
|
|
|
|
|
|
|
|
|
br := bufio.NewReaderSize(c, utils.ReaderBufferSize) |
|
|
|
br := bufio.NewReaderSize(c, utils.ReaderBufferSize) |
|
|
|
bw := bufio.NewWriterSize(c, utils.WriterBufferSize) |
|
|
|
bw := bufio.NewWriterSize(c, utils.WriterBufferSize) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
log.Infof("try to send 'psync' command") |
|
|
|
runid, offset, wait := utils.SendPSyncFullsync(br, bw) |
|
|
|
runid, offset, wait := utils.SendPSyncFullsync(br, bw) |
|
|
|
cmd.targetOffset.Set(offset) |
|
|
|
cmd.targetOffset.Set(offset) |
|
|
|
log.Infof("psync runid = %s offset = %d, fullsync", runid, offset) |
|
|
|
log.Infof("psync runid = %s offset = %d, fullsync", runid, offset) |
|
|
|