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

comment out debug messages

Browse Source
This commit is contained in:
Chris Lu
2020-04-05 20:15:17 -07:00
parent 78ea937606
commit 19edd9c091
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
weed/queue/log_buffer.go
View File

@@ -1,8 +1,6 @@
package queue package queue
import ( import (
"fmt"
"runtime/debug"
"sync" "sync"
"time" "time"
@@ -121,8 +119,7 @@ func (m *LogBuffer) loopInterval() {
func (m *LogBuffer) copyToFlush() *dataToFlush { func (m *LogBuffer) copyToFlush() *dataToFlush {
if m.flushFn != nil && m.pos > 0 { if m.flushFn != nil && m.pos > 0 {
fmt.Printf("flush buffer %d pos %d empty space %d\n", len(m.buf), m.pos, len(m.buf)-m.pos) // fmt.Printf("flush buffer %d pos %d empty space %d\n", len(m.buf), m.pos, len(m.buf)-m.pos)
debug.PrintStack()
d := &dataToFlush{ d := &dataToFlush{
startTime: m.startTime, startTime: m.startTime,
stopTime: m.stopTime, stopTime: m.stopTime,
@@ -154,26 +151,34 @@ func (m *LogBuffer) ReadFromBuffer(lastReadTime time.Time) (ts time.Time, buffer
lastTs := lastReadTime.UnixNano() lastTs := lastReadTime.UnixNano()
l, h := 0, len(m.idx)-1 l, h := 0, len(m.idx)-1
/* /*
for i, pos := range m.idx { for i, pos := range m.idx {
ts := readTs(m.buf, pos) logEntry, ts := readTs(m.buf, pos)
fmt.Printf("entry %d ts: %v offset:%d\n", i, time.Unix(0,ts), pos) event := &filer_pb.FullEventNotification{}
proto.Unmarshal(logEntry.Data, event)
entry := event.EventNotification.OldEntry
if entry == nil {
entry = event.EventNotification.NewEntry
} }
fmt.Printf("l=%d, h=%d\n", l, h) fmt.Printf("entry %d ts: %v offset:%d dir:%s name:%s\n", i, time.Unix(0, ts), pos, event.Directory, entry.Name)
*/ }
fmt.Printf("l=%d, h=%d\n", l, h)
*/
for l <= h { for l <= h {
mid := (l + h) / 2 mid := (l + h) / 2
pos := m.idx[mid] pos := m.idx[mid]
t := readTs(m.buf, m.idx[mid]) _, t := readTs(m.buf, m.idx[mid])
if t <= lastTs { if t <= lastTs {
l = mid + 1 l = mid + 1
} else if lastTs < t { } else if lastTs < t {
var prevT int64 var prevT int64
if mid > 0 { if mid > 0 {
prevT = readTs(m.buf, m.idx[mid-1]) _, prevT = readTs(m.buf, m.idx[mid-1])
} }
if prevT <= lastTs { if prevT <= lastTs {
// println("found mid = ", mid)
return time.Unix(0, t), copiedBytes(m.buf[pos:m.pos]) return time.Unix(0, t), copiedBytes(m.buf[pos:m.pos])
} }
h = mid - 1 h = mid - 1
@@ -181,6 +186,10 @@ func (m *LogBuffer) ReadFromBuffer(lastReadTime time.Time) (ts time.Time, buffer
// fmt.Printf("l=%d, h=%d\n", l, h) // fmt.Printf("l=%d, h=%d\n", l, h)
} }
// FIXME: this could be that the buffer has been flushed already
// println("not found")
return lastReadTime, nil
} }
func copiedBytes(buf []byte) (copied []byte) { func copiedBytes(buf []byte) (copied []byte) {
copied = make([]byte, len(buf)) copied = make([]byte, len(buf))
@@ -188,7 +197,7 @@ func copiedBytes(buf []byte) (copied []byte) {
return return
} }
func readTs(buf []byte, pos int) int64 { func readTs(buf []byte, pos int) (*filer_pb.LogEntry, int64) {
size := util.BytesToUint32(buf[pos : pos+4]) size := util.BytesToUint32(buf[pos : pos+4])
entryData := buf[pos+4 : pos+4+int(size)] entryData := buf[pos+4 : pos+4+int(size)]
@@ -198,6 +207,6 @@ func readTs(buf []byte, pos int) int64 {
if err != nil { if err != nil {
glog.Fatalf("unexpected unmarshal filer_pb.LogEntry: %v", err) glog.Fatalf("unexpected unmarshal filer_pb.LogEntry: %v", err)
} }
return logEntry.TsNs return logEntry, logEntry.TsNs
} }