Merge pull request #335 from amshuman-kr/cherry-pick/PR334-on-rel-v0.12

Updated number of chunks while uploading to never exceed the cloud provider limits.
gardener · May 26, 2021 · 2aecca0 · 2aecca0
2 parents 5c9d1ba + 5b8eace
commit 2aecca0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/pkg/snapstore/gcs_snapstore.go b/pkg/snapstore/gcs_snapstore.go
@@ -43,7 +43,8 @@ type GCSSnapStore struct {
 }
 
 const (
-	gcsNoOfChunk int64 = 32
+	// Total number of chunks to be uploaded must be one less than maximum limit allowed.
+	gcsNoOfChunk int64 = 31
 )
 
 // NewGCSSnapStore create new GCSSnapStore from shared configuration with specified bucket.

diff --git a/pkg/snapstore/oss_snapstore.go b/pkg/snapstore/oss_snapstore.go
@@ -40,7 +40,8 @@ type OSSBucket interface {
 }
 
 const (
-	ossNoOfChunk    int64 = 10000
+	// Total number of chunks to be uploaded must be one less than maximum limit allowed.
+	ossNoOfChunk    int64 = 9999
 	ossEndPoint           = "ALICLOUD_ENDPOINT"
 	accessKeyID           = "ALICLOUD_ACCESS_KEY_ID"
 	accessKeySecret       = "ALICLOUD_ACCESS_KEY_SECRET"

diff --git a/pkg/snapstore/s3_snapstore.go b/pkg/snapstore/s3_snapstore.go
@@ -34,7 +34,8 @@ import (
 )
 
 const (
-	s3NoOfChunk int64 = 10000 //Default configuration in swift installation
+	// Total number of chunks to be uploaded must be one less than maximum limit allowed.
+	s3NoOfChunk int64 = 9999
 )
 
 // S3SnapStore is snapstore with AWS S3 object store as backend

diff --git a/pkg/snapstore/swift_snapstore.go b/pkg/snapstore/swift_snapstore.go
@@ -46,7 +46,8 @@ type SwiftSnapStore struct {
 }
 
 const (
-	swiftNoOfChunk int64 = 1000 //Default configuration in swift installation
+	// Total number of chunks to be uploaded must be one less than maximum limit allowed.
+	swiftNoOfChunk int64 = 999 //Default configuration in swift installation
 )
 
 // NewSwiftSnapStore create new SwiftSnapStore from shared configuration with specified bucket