gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add memory buffer size limit

Browse Source
This commit is contained in:
Chris Lu
2020-04-20 17:43:50 -07:00
parent 258fba8a0f
commit 5eb83dfbd3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
weed/util/log_buffer/log_buffer.go
View File

@@ -170,14 +170,15 @@ func (m *LogBuffer) ReadFromBuffer(lastReadTime time.Time) (bufferCopy *bytes.Bu
for i, buf := range m.prevBuffers.buffers { for i, buf := range m.prevBuffers.buffers {
if buf.startTime.After(lastReadTime) { if buf.startTime.After(lastReadTime) {
if i == 0 { if i == 0 {
println("return the earliest in memory") // println("return the earliest in memory", buf.startTime.UnixNano())
return copiedBytes(buf.buf[:buf.size]) return copiedBytes(buf.buf[:buf.size])
} }
return copiedBytes(buf.buf[:buf.size]) return copiedBytes(buf.buf[:buf.size])
} }
if !buf.startTime.After(lastReadTime) && buf.stopTime.After(lastReadTime) { if !buf.startTime.After(lastReadTime) && buf.stopTime.After(lastReadTime) {
pos := buf.locateByTs(lastReadTime) pos := buf.locateByTs(lastReadTime)
return copiedBytes(buf.buf[pos:]) // fmt.Printf("locate buffer[%d] pos %d\n", i, pos)
return copiedBytes(buf.buf[pos:buf.size])
} }
} }
return copiedBytes(m.buf[:m.pos]) return copiedBytes(m.buf[:m.pos])