diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2022-05-30 21:38:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-30 21:38:31 -0700 |
| commit | ca01ce05249c336ed380d9f77efbee68213b8a37 (patch) | |
| tree | 2241d21d85b966d4957bae06ea09cdc4ad6bb534 /weed/messaging | |
| parent | 8902fa6ff653aa40249d2d6da49a9227b63415bb (diff) | |
| parent | 6adc42147f972d2adc223e119c0f97094b3f0bec (diff) | |
| download | seaweedfs-ca01ce05249c336ed380d9f77efbee68213b8a37.tar.xz seaweedfs-ca01ce05249c336ed380d9f77efbee68213b8a37.zip | |
Merge pull request #3122 from chrislusf/filer-sync-with-peers
Filer bootstrap from peers
Diffstat (limited to 'weed/messaging')
| -rw-r--r-- | weed/messaging/broker/broker_grpc_server_subscribe.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/weed/messaging/broker/broker_grpc_server_subscribe.go b/weed/messaging/broker/broker_grpc_server_subscribe.go index f29121c76..20d529239 100644 --- a/weed/messaging/broker/broker_grpc_server_subscribe.go +++ b/weed/messaging/broker/broker_grpc_server_subscribe.go @@ -117,7 +117,7 @@ func (broker *MessageBroker) Subscribe(stream messaging_pb.SeaweedMessaging_Subs lastReadTime = time.Unix(0, processedTsNs) } - lastReadTime, err = lock.logBuffer.LoopProcessLogData("broker", lastReadTime, func() bool { + lastReadTime, _, err = lock.logBuffer.LoopProcessLogData("broker", lastReadTime, 0, func() bool { lock.Mutex.Lock() lock.cond.Wait() lock.Mutex.Unlock() @@ -164,7 +164,7 @@ func (broker *MessageBroker) readPersistedLogBuffer(tp *TopicPartition, startTim // println("partition", tp.Partition, "processing", dayDir, "/", hourMinuteEntry.Name) chunkedFileReader := filer.NewChunkStreamReader(broker, hourMinuteEntry.Chunks) defer chunkedFileReader.Close() - if _, err := filer.ReadEachLogEntry(chunkedFileReader, sizeBuf, startTsNs, eachLogEntryFn); err != nil { + if _, err := filer.ReadEachLogEntry(chunkedFileReader, sizeBuf, startTsNs, 0, eachLogEntryFn); err != nil { chunkedFileReader.Close() if err == io.EOF { return err |