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

log tsNs should be processing time

Browse source
This commit is contained in:
Chris Lu 2021-09-26 11:54:13 -07:00
parent 2baed2e1e9
commit 9887610b54
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
weed/filer/meta_aggregator.go
View file

@ -110,7 +110,7 @@ func (ma *MetaAggregator) subscribeToOneFiler(f *Filer, self pb.ServerAddress, p
} }
dir := event.Directory dir := event.Directory
// println("received meta change", dir, "size", len(data)) // println("received meta change", dir, "size", len(data))
ma.MetaLogBuffer.AddToBuffer([]byte(dir), data, 0) ma.MetaLogBuffer.AddToBuffer([]byte(dir), data, event.TsNs)
if maybeReplicateMetadataChange != nil { if maybeReplicateMetadataChange != nil {
maybeReplicateMetadataChange(event) maybeReplicateMetadataChange(event)
} }

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

@ -56,7 +56,7 @@ func NewLogBuffer(name string, flushInterval time.Duration, flushFn func(startTi
return lb return lb
} }
func (m *LogBuffer) AddToBuffer(partitionKey, data []byte, eventTsNs int64) { func (m *LogBuffer) AddToBuffer(partitionKey, data []byte, processingTsNs int64) {
m.Lock() m.Lock()
defer func() { defer func() {
@ -68,20 +68,20 @@ func (m *LogBuffer) AddToBuffer(partitionKey, data []byte, eventTsNs int64) {
// need to put the timestamp inside the lock // need to put the timestamp inside the lock
var ts time.Time var ts time.Time
if eventTsNs == 0 { if processingTsNs == 0 {
ts = time.Now() ts = time.Now()
eventTsNs = ts.UnixNano() processingTsNs = ts.UnixNano()
} else { } else {
ts = time.Unix(0, eventTsNs) ts = time.Unix(0, processingTsNs)
} }
if m.lastTsNs >= eventTsNs { if m.lastTsNs >= processingTsNs {
// this is unlikely to happen, but just in case // this is unlikely to happen, but just in case
eventTsNs = m.lastTsNs + 1 processingTsNs = m.lastTsNs + 1
ts = time.Unix(0, eventTsNs) ts = time.Unix(0, processingTsNs)
} }
m.lastTsNs = eventTsNs m.lastTsNs = processingTsNs
logEntry := &filer_pb.LogEntry{ logEntry := &filer_pb.LogEntry{
TsNs: eventTsNs, TsNs: processingTsNs,
PartitionKeyHash: util.HashToInt32(partitionKey), PartitionKeyHash: util.HashToInt32(partitionKey),
Data: data, Data: data,
} }