gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

avoid data race of LogBuffer isStopping (#3859)

Browse source
This commit is contained in:
Konstantin Lebedev 2022-10-16 23:28:56 +05:00 committed by GitHub
parent 7836f7574e
commit ee38ab8581
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
weed/util/log_buffer/log_buffer.go
View file

@ -118,6 +118,13 @@ func (m *LogBuffer) AddToBuffer(partitionKey, data []byte, processingTsNs int64)
} }
func (m *LogBuffer) IsStopping() bool {
m.RLock()
defer m.RUnlock()
return m.isStopping
}
func (m *LogBuffer) Shutdown() { func (m *LogBuffer) Shutdown() {
m.Lock() m.Lock()
defer m.Unlock() defer m.Unlock()
@ -144,13 +151,12 @@ func (m *LogBuffer) loopFlush() {
} }
func (m *LogBuffer) loopInterval() { func (m *LogBuffer) loopInterval() {
for !m.isStopping { for !m.IsStopping() {
time.Sleep(m.flushInterval) time.Sleep(m.flushInterval)
m.Lock() if m.IsStopping() {
if m.isStopping {
m.Unlock()
return return
} }
m.Lock()
toFlush := m.copyToFlush() toFlush := m.copyToFlush()
m.Unlock() m.Unlock()
if toFlush != nil { if toFlush != nil {