Skip to content
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

cmd/sync: limit the maximum memory size for multiple upload #4135

Merged
merged 5 commits into from
Nov 2, 2023
Merged

cmd/sync: limit the maximum memory size for multiple upload #4135

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
172ee97
cmd/sync: limit the maximum memory size for multiple upload is 32MB t…
zhijian-pro Nov 1, 2023
eeafd53
fix last part size
zhijian-pro Nov 2, 2023
545cb13
debug
zhijian-pro Nov 2, 2023
2832a15
review
davies Nov 2, 2023
cdb5f6f
recover
zhijian-pro Nov 2, 2023
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
32 changes: 29 additions & 3 deletions pkg/sync/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"sync"
"time"

"github.com/juicedata/juicefs/pkg/chunk"
"github.com/juicedata/juicefs/pkg/object"
"github.com/juicedata/juicefs/pkg/utils"
"github.com/juju/ratelimit"
Expand Down Expand Up @@ -177,6 +178,13 @@ var bufPool = sync.Pool{
},
}

var (
// for multiple upload mem limit
availMem int64
mutex sync.Mutex
cond = sync.NewCond(&mutex)
)

func try(n int, f func() error) (err error) {
for i := 0; i < n; i++ {
err = f()
Expand Down Expand Up @@ -429,15 +437,27 @@ func doCopyMultiple(src, dst object.ObjectStorage, key string, size int64, uploa
abort := make(chan struct{})
parts := make([]*object.Part, n)
errs := make(chan error, n)

for i := 0; i < n; i++ {
go func(num int) {
sz := partSize
if num == n-1 {
sz = size - int64(num)*partSize
}
if limiter != nil {
limiter.Wait(sz)

mutex.Lock()
for availMem < 0 {
cond.Wait()
}
availMem -= partSize
mutex.Unlock()
defer func() {
mutex.Lock()
availMem += partSize
mutex.Unlock()
cond.Signal()
}()

select {
case <-abort:
errs <- fmt.Errorf("aborted")
Expand All @@ -448,7 +468,12 @@ func doCopyMultiple(src, dst object.ObjectStorage, key string, size int64, uploa
}()
}

data := make([]byte, sz)
if limiter != nil {
limiter.Wait(sz)
}
p := chunk.NewOffPage(int(sz))
defer p.Release()
data := p.Data
if err := try(3, func() error {
in, err := src.Get(key, int64(num)*partSize, sz)
if err != nil {
Expand Down Expand Up @@ -1002,6 +1027,7 @@ func Sync(src, dst object.ObjectStorage, config *Config) error {
if config.Manager != "" {
bufferSize = 100
}
availMem = int64(config.Threads * 32 << 20)
tasks := make(chan object.Object, bufferSize)
wg := sync.WaitGroup{}
concurrent = make(chan int, config.Threads)
Expand Down