diff options
| author | Chris Lu <chris.lu@gmail.com> | 2021-09-26 11:55:27 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2021-09-26 11:55:27 -0700 |
| commit | 603ea2db7329615e81c75e63bd8c86379c700795 (patch) | |
| tree | 0086a0d719893f1864c281a6198138e735941e95 /weed/util/log_buffer/log_buffer.go | |
| parent | 9887610b545c38ac3bce580a6bbf96ba63b61308 (diff) | |
| download | seaweedfs-603ea2db7329615e81c75e63bd8c86379c700795.tar.xz seaweedfs-603ea2db7329615e81c75e63bd8c86379c700795.zip | |
avoid looping forever if there are no more metadata updates
Diffstat (limited to 'weed/util/log_buffer/log_buffer.go')
| -rw-r--r-- | weed/util/log_buffer/log_buffer.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/weed/util/log_buffer/log_buffer.go b/weed/util/log_buffer/log_buffer.go index a6d94670a..c7ddf2d9c 100644 --- a/weed/util/log_buffer/log_buffer.go +++ b/weed/util/log_buffer/log_buffer.go @@ -189,7 +189,11 @@ func (m *LogBuffer) ReadFromBuffer(lastReadTime time.Time) (bufferCopy *bytes.Bu defer m.RUnlock() if !m.lastFlushTime.IsZero() && m.lastFlushTime.After(lastReadTime) { - return nil, ResumeFromDiskError + if time.Now().Sub(m.lastFlushTime) < m.flushInterval * 2 { + diff := m.lastFlushTime.Sub(lastReadTime) + glog.V(4).Infof("lastFlush:%v lastRead:%v diff:%v", m.lastFlushTime, lastReadTime, diff) + return nil, ResumeFromDiskError + } } /* |