aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchrislu <chris.lu@gmail.com>2024-07-11 00:26:18 -0700
committerchrislu <chris.lu@gmail.com>2024-07-11 00:26:18 -0700
commit590397229e00dc90366d1f7eb15b85a0f88037dd (patch)
treef1922b4ba540a42a8a479d26e503b4ac1d5d7f6a
parent06e3dd306f851d64ec8b84e74d115c5cd100a9cb (diff)
downloadseaweedfs-590397229e00dc90366d1f7eb15b85a0f88037dd.tar.xz
seaweedfs-590397229e00dc90366d1f7eb15b85a0f88037dd.zip
fix heap init
-rw-r--r--weed/filer/filer_notify_read.go18
1 files changed, 10 insertions, 8 deletions
diff --git a/weed/filer/filer_notify_read.go b/weed/filer/filer_notify_read.go
index 1cdf12d63..115a925e9 100644
--- a/weed/filer/filer_notify_read.go
+++ b/weed/filer/filer_notify_read.go
@@ -226,17 +226,19 @@ func (c *LogFileEntryCollector) collectMore(v *OrderedLogVisitor) (err error) {
glog.Errorf("Unexpected! failed to find iterator for filer %s", filerId)
continue
}
- next, err := iter.getNext(v)
- if err != nil {
- if err == io.EOF {
+ next, nextErr := iter.getNext(v)
+ if nextErr != nil {
+ if nextErr == io.EOF {
// do nothing since the filer has no more log entries
+ }else {
+ return fmt.Errorf("failed to get next log entry for %v: %v", entryName, err)
}
- return fmt.Errorf("failed to get next log entry for %v: %v", entryName, err)
+ } else {
+ heap.Push(v.pq, &LogEntryItem{
+ Entry: next,
+ filer: filerId,
+ })
}
- heap.Push(v.pq, &LogEntryItem{
- Entry: next,
- filer: filerId,
- })
}
return nil