aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2020-04-20 17:43:50 -0700
committerChris Lu <chris.lu@gmail.com>2020-04-20 17:43:50 -0700
commit5eb83dfbd349b069dbf1ec0b2cafc160f743e312 (patch)
treed69dfcb152e27520666080a8495fadd2a12b3886
parent258fba8a0f9c449b2aa7582a7e19159e3230b1a8 (diff)
downloadseaweedfs-5eb83dfbd349b069dbf1ec0b2cafc160f743e312.tar.xz
seaweedfs-5eb83dfbd349b069dbf1ec0b2cafc160f743e312.zip
add memory buffer size limit
-rw-r--r--weed/util/log_buffer/log_buffer.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/weed/util/log_buffer/log_buffer.go b/weed/util/log_buffer/log_buffer.go
index e733ddc75..e447aacb7 100644
--- a/weed/util/log_buffer/log_buffer.go
+++ b/weed/util/log_buffer/log_buffer.go
@@ -170,14 +170,15 @@ func (m *LogBuffer) ReadFromBuffer(lastReadTime time.Time) (bufferCopy *bytes.Bu
for i, buf := range m.prevBuffers.buffers {
if buf.startTime.After(lastReadTime) {
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])
}
if !buf.startTime.After(lastReadTime) && buf.stopTime.After(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])