Skip to content

wait for mpuid until got in waitForCreateMPU #502

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

wait for mpuid until got in waitForCreateMPU #502

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 6 additions & 13 deletions internal/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,15 +151,6 @@ func (fh *FileHandle) mpuPart(buf *MBuf, part uint32, total int64) {
fh.mpuWG.Done()
}()

// maybe wait for CreateMultipartUpload
if fh.mpuId == nil {
fh.mpuWG.Wait()
// initMPU might have errored
if fh.mpuId == nil {
return
}
}

err := fh.mpuPartNoSpawn(buf, part, total, false)
if err != nil {
if fh.lastWriteError == nil {
Expand All @@ -169,18 +160,20 @@ func (fh *FileHandle) mpuPart(buf *MBuf, part uint32, total int64) {
}

func (fh *FileHandle) waitForCreateMPU() (err error) {
if fh.mpuId == nil {
for {
if fh.mpuId != nil || err != nil {
return
}

fh.mu.Unlock()
fh.initWrite()
fh.mpuWG.Wait() // wait for initMPU
fh.mu.Lock()

if fh.lastWriteError != nil {
return fh.lastWriteError
err = fh.lastWriteError
}
}

return
}

func (fh *FileHandle) partSize() uint64 {
Expand Down