apps/redis-go
0
0
Fork 0
mirror of https://github.com/HDT3213/godis.git synced 2025-10-05 16:57:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

bug fix: stopMaster

Browse Source
This commit is contained in:
finley
2022-12-21 19:00:21 +08:00
parent 0d96ad295d
commit a6d07ce5df
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
database/replication_master.go
View File

@@ -371,10 +371,10 @@ var pingBytes = protocol.MakeMultiBulkReply(utils.ToCmdLine("ping")).ToBytes()
const maxBacklogSize = 10 * 1024 * 1024 // 10MB const maxBacklogSize = 10 * 1024 * 1024 // 10MB
func (mdb *MultiDB) masterCron() { func (mdb *MultiDB) masterCron() {
if mdb.role != masterRole { mdb.masterStatus.mu.Lock()
if len(mdb.masterStatus.slaveMap) == 0 { // no slaves, do nothing
return return
} }
mdb.masterStatus.mu.Lock()
if mdb.masterStatus.bgSaveState == bgSaveFinish { if mdb.masterStatus.bgSaveState == bgSaveFinish {
mdb.masterStatus.backlog.appendBytes(pingBytes) mdb.masterStatus.backlog.appendBytes(pingBytes)
} }
@@ -443,11 +443,13 @@ func (mdb *MultiDB) stopMaster() {
} }
// clean master status // clean master status
if mdb.aofHandler != nil {
mdb.aofHandler.RemoveListener(mdb.masterStatus.aofListener) mdb.aofHandler.RemoveListener(mdb.masterStatus.aofListener)
}
_ = os.Remove(mdb.masterStatus.rdbFilename) _ = os.Remove(mdb.masterStatus.rdbFilename)
mdb.masterStatus.rdbFilename = "" mdb.masterStatus.rdbFilename = ""
mdb.masterStatus.replId = "" mdb.masterStatus.replId = ""
mdb.masterStatus.backlog = nil mdb.masterStatus.backlog = &replBacklog{}
mdb.masterStatus.slaveMap = make(map[redis.Connection]*slaveClient) mdb.masterStatus.slaveMap = make(map[redis.Connection]*slaveClient)
mdb.masterStatus.waitSlaves = make(map[*slaveClient]struct{}) mdb.masterStatus.waitSlaves = make(map[*slaveClient]struct{})
mdb.masterStatus.onlineSlaves = make(map[*slaveClient]struct{}) mdb.masterStatus.onlineSlaves = make(map[*slaveClient]struct{})