From d8297ee2a71de6ac16dd069a192056ad85266acd Mon Sep 17 00:00:00 2001 From: Nour Elmenyawi Date: Fri, 9 Feb 2024 11:01:49 +0000 Subject: [PATCH 1/3] Sleeps to uploader --- cloud/objstore/objutil/uploader.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cloud/objstore/objutil/uploader.go b/cloud/objstore/objutil/uploader.go index 55656b6..ef77857 100644 --- a/cloud/objstore/objutil/uploader.go +++ b/cloud/objstore/objutil/uploader.go @@ -181,6 +181,8 @@ func (m *MPUploader) upload(ctx context.Context, number int, metadata any, body return fmt.Errorf("failed to upload part: %w", err) } + time.Sleep(30*time.Second) + fmt.Println("Sleeping here") // Parts may be uploaded concurrently, but must be marked as completed one at a time m.lock.Lock() defer m.lock.Unlock() From 1e376c8d29d3b471a3fcb930aa4b19bf12bcc9fd Mon Sep 17 00:00:00 2001 From: Nour Elmenyawi Date: Fri, 9 Feb 2024 11:16:30 +0000 Subject: [PATCH 2/3] Add time package --- cloud/objstore/objutil/uploader.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cloud/objstore/objutil/uploader.go b/cloud/objstore/objutil/uploader.go index ef77857..3d27fb5 100644 --- a/cloud/objstore/objutil/uploader.go +++ b/cloud/objstore/objutil/uploader.go @@ -9,6 +9,7 @@ import ( "sync" "sync/atomic" + "time" "github.com/couchbase/tools-common/cloud/v2/objstore/objcli" "github.com/couchbase/tools-common/cloud/v2/objstore/objcli/objaws" "github.com/couchbase/tools-common/cloud/v2/objstore/objval" From 2e83f69a8aac821ca509e694480995d12fe55d62 Mon Sep 17 00:00:00 2001 From: Nour Elmenyawi Date: Tue, 13 Feb 2024 16:00:27 +0000 Subject: [PATCH 3/3] Remove Sleep & Add buffer limit --- cloud/objstore/objutil/uploader.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cloud/objstore/objutil/uploader.go b/cloud/objstore/objutil/uploader.go index 3d27fb5..fb9ccb8 100644 --- a/cloud/objstore/objutil/uploader.go +++ b/cloud/objstore/objutil/uploader.go @@ -9,7 +9,6 @@ import ( "sync" "sync/atomic" - "time" "github.com/couchbase/tools-common/cloud/v2/objstore/objcli" "github.com/couchbase/tools-common/cloud/v2/objstore/objcli/objaws" "github.com/couchbase/tools-common/cloud/v2/objstore/objval" @@ -115,7 +114,7 @@ func NewMPUploader(opts MPUploaderOptions) (*MPUploader, error) { } // Only create the pool after successfully creating the multipart upload to avoid having to handle cleanup - uploader.pool = hofp.NewPool(hofp.Options{LogPrefix: "(objutil)"}) + uploader.pool = hofp.NewPool(hofp.Options{LogPrefix: "(objutil)", Size: 1}) return uploader, nil } @@ -182,8 +181,6 @@ func (m *MPUploader) upload(ctx context.Context, number int, metadata any, body return fmt.Errorf("failed to upload part: %w", err) } - time.Sleep(30*time.Second) - fmt.Println("Sleeping here") // Parts may be uploaded concurrently, but must be marked as completed one at a time m.lock.Lock() defer m.lock.Unlock()