From 92811d8ea1c07cf8721d934cd7e76ae62a311095 Mon Sep 17 00:00:00 2001 From: siddontang Date: Tue, 10 Feb 2015 13:42:34 +0800 Subject: [PATCH] add some redis compatibility info replication msgs --- server/info.go | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/server/info.go b/server/info.go index b06b084..ef4d089 100644 --- a/server/info.go +++ b/server/info.go @@ -205,6 +205,18 @@ func (i *info) dumpReplication(buf *bytes.Buffer) { } i.app.slock.Unlock() + i.app.m.Lock() + slaveof := i.app.cfg.SlaveOf + i.app.m.Unlock() + + isSlave := len(slaveof) > 0 + + if isSlave { + p = append(p, infoPair{"role", "slave"}) + } else { + p = append(p, infoPair{"role", "master"}) + } + num := i.Replication.PubLogNum.Get() p = append(p, infoPair{"pub_log_num", num}) @@ -216,13 +228,14 @@ func (i *info) dumpReplication(buf *bytes.Buffer) { p = append(p, infoPair{"pub_log_ack_per_time", 0}) } - p = append(p, infoPair{"slaveof", i.app.cfg.SlaveOf}) + p = append(p, infoPair{"slaveof", slaveof}) if len(slaves) > 0 { p = append(p, infoPair{"slaves", strings.Join(slaves, ",")}) } - if s, _ := i.app.ldb.ReplicationStat(); s != nil { + s, _ := i.app.ldb.ReplicationStat() + if s != nil { p = append(p, infoPair{"last_log_id", s.LastID}) p = append(p, infoPair{"first_log_id", s.FirstID}) p = append(p, infoPair{"commit_log_id", s.CommitID}) @@ -234,6 +247,28 @@ func (i *info) dumpReplication(buf *bytes.Buffer) { p = append(p, infoPair{"master_last_log_id", i.Replication.MasterLastLogID.Get()}) + if isSlave { + // add some redis slave replication info for outer failover service :-) + state := i.app.m.state.Get() + if state == replSyncState || state == replConnectedState { + p = append(p, infoPair{"master_link_status", "up"}) + } else { + p = append(p, infoPair{"master_link_status", "down"}) + } + + // here, all the slaves have same priority now + p = append(p, infoPair{"slave_priority", 100}) + if s != nil { + if s.LastID > 0 { + p = append(p, infoPair{"slave_repl_offset", s.LastID}) + } else { + p = append(p, infoPair{"slave_repl_offset", s.CommitID}) + } + } else { + p = append(p, infoPair{"slave_repl_offset", 0}) + } + } + i.dumpPairs(buf, p...) }