re
/
ledisdb
forked from mirror/ledisdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hand up for new event if no one now 

do not wait 1 second
This commit is contained in:
siddontang 2014-09-05 10:01:38 +08:00
parent b6e44c3dc0
commit c8e5e39f9d
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/cmd_replication.go
View File

@ -96,7 +96,7 @@ func syncCommand(c *client) error {
m := &ledis.BinLogAnchor{logIndex, logPos}
if _, err := c.app.ldb.ReadEventsTo(m, &c.syncBuf); err != nil {
if _, err := c.app.ldb.ReadEventsToTimeout(m, &c.syncBuf, 5); err != nil {
return err
} else {
buf := c.syncBuf.Bytes()

22
server/replication.go
View File

@ -204,7 +204,10 @@ func (m *master) runReplication() {
if m.info.LogFileIndex == 0 {
//try a fullsync
if err := m.fullSync(); err != nil {
log.Warn("full sync error %s", err.Error())
if m.conn != nil {
//if conn == nil, other close the replication, not error
log.Warn("full sync error %s", err.Error())
}
return
}
@ -216,24 +219,18 @@ func (m *master) runReplication() {
}
for {
for {
lastIndex := m.info.LogFileIndex
lastPos := m.info.LogPos
if err := m.sync(); err != nil {
if err := m.sync(); err != nil {
if m.conn != nil {
//if conn == nil, other close the replication, not error
log.Warn("sync error %s", err.Error())
return
}
if m.info.LogFileIndex == lastIndex && m.info.LogPos == lastPos {
//sync no data, wait 1s and retry
break
}
return
}
select {
case <-m.quit:
return
case <-time.After(1 * time.Second):
default:
break
}
}
@ -291,6 +288,7 @@ func (m *master) sync() error {
cmd := ledis.Slice(fmt.Sprintf(syncCmdFormat, len(logIndexStr),
logIndexStr, len(logPosStr), logPosStr))
if _, err := m.conn.Write(cmd); err != nil {
return err
}