Skip to content

Fix contention issues, hotfix for GC #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 20, 2025
+19 −9
Merged

Fix contention issues, hotfix for GC #24

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
28edae5
test contention
luke-lombardi Jan 17, 2025
4d5efa4
only lock in fetch
luke-lombardi Jan 17, 2025
7193499
only lock if we are still fetching
luke-lombardi Jan 17, 2025
0befd4a
better memory cleanup
luke-lombardi Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 19 additions & 9 deletions pkg/blobfs_prefetch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package blobcache
import (
"context"
"fmt"
"runtime"
"sync"
"time"
)
Expand Down Expand Up @@ -200,20 +201,27 @@ func (pb *PrefetchBuffer) fetch(windowIndex uint64) {
func (pb *PrefetchBuffer) IsIdle() bool {
idle := true

pb.mu.Lock()
defer pb.mu.Unlock()

windowsToDelete := make([]int64, 0)
pb.windows.Range(func(key, value any) bool {
w := value.(*window)
if w != nil && time.Since(w.lastRead) > pb.manager.windowIdleTTL && !w.fetching {
return true
windowsToDelete = append(windowsToDelete, w.index)
} else {
idle = false
}

return true
})

for _, index := range windowsToDelete {
w, exists := pb.windows.Load(index)
if exists {
w.(*window).data = nil
}

pb.windows.Delete(index)
}

return idle
}

Expand All @@ -231,8 +239,11 @@ func (pb *PrefetchBuffer) Clear() {
if w != nil {
w.data = nil
}

return true
})

runtime.GC()
}

func (pb *PrefetchBuffer) GetRange(offset, length uint64) ([]byte, error) {
Expand Down Expand Up @@ -261,9 +272,6 @@ func (pb *PrefetchBuffer) GetRange(offset, length uint64) ([]byte, error) {
}

func (pb *PrefetchBuffer) tryGetRange(offset, length uint64) ([]byte, bool, bool) {
pb.mu.Lock()
defer pb.mu.Unlock()

windowIndex := offset / pb.windowSize

var w *window
Expand All @@ -282,8 +290,10 @@ func (pb *PrefetchBuffer) tryGetRange(offset, length uint64) ([]byte, bool, bool
return nil, false, false
}

w.mu.Lock()
defer w.mu.Unlock()
if w.fetching {
w.mu.Lock()
defer w.mu.Unlock()
}

windowOffset := offset - (windowIndex * pb.windowSize)
windowHead := (windowIndex * pb.windowSize) + w.readLength
Expand Down