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

Merge branch 'develop'

This commit is contained in:
siddontang 2014-06-12 21:30:20 +08:00
parent 6120d3a8c2 9e3dfc2191
commit 620ad6a88b
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/replication.go
View File

@ -87,11 +87,21 @@ func (m *master) loadInfo() error {
return err return err
} }
println(m.addr, m.logFileIndex, m.logPos)
return nil return nil
} }
func (m *master) saveInfo() error { func (m *master) saveInfo() error {
data, err := json.Marshal(m) data, err := json.Marshal(struct {
Addr string `json:"addr"`
LogFileIndex int64 `json:"log_file_index"`
LogPos int64 `json:"log_pos"`
}{
m.addr,
m.logFileIndex,
m.logPos,
})
if err != nil { if err != nil {
return err return err
} }
@ -263,7 +273,7 @@ func (m *master) fullSync() error {
m.logFileIndex = head.LogFileIndex m.logFileIndex = head.LogFileIndex
m.logPos = head.LogPos m.logPos = head.LogPos
return nil return m.saveInfo()
} }
func (m *master) sync() error { func (m *master) sync() error {
@ -307,7 +317,7 @@ func (m *master) sync() error {
return err return err
} }
return nil return m.saveInfo()
} }