File tree Expand file tree Collapse file tree 3 files changed +24
-0
lines changed Expand file tree Collapse file tree 3 files changed +24
-0
lines changed Original file line number Diff line number Diff line change @@ -393,6 +393,10 @@ func (s *S3Backend) Init(key string) error {
393
393
var isAws bool
394
394
var err error
395
395
396
+ if s .config .NoDetect {
397
+ return nil
398
+ }
399
+
396
400
if ! s .config .RegionSet {
397
401
err , _ = s .detectBucketLocationByHEAD ()
398
402
if err == nil {
@@ -1187,6 +1191,10 @@ func (s *S3Backend) MultipartBlobAbort(param *MultipartBlobCommitInput) (*Multip
1187
1191
}
1188
1192
1189
1193
func (s * S3Backend ) MultipartExpire (param * MultipartExpireInput ) (* MultipartExpireOutput , error ) {
1194
+ if s .config .NoExpireMultipart {
1195
+ return & MultipartExpireOutput {}, nil
1196
+ }
1197
+
1190
1198
mpu , err := s .ListMultipartUploads (& s3.ListMultipartUploadsInput {
1191
1199
Bucket : & s .bucket ,
1192
1200
})
Original file line number Diff line number Diff line change @@ -54,8 +54,11 @@ type S3Config struct {
54
54
ColdMinSize uint64
55
55
MultipartAge time.Duration
56
56
57
+ NoExpireMultipart bool
58
+
57
59
MultipartCopyThreshold uint64
58
60
61
+ NoDetect bool
59
62
UseSSE bool
60
63
UseKMS bool
61
64
KMSKeyID string
Original file line number Diff line number Diff line change @@ -254,6 +254,16 @@ MISC OPTIONS:
254
254
Value : "" ,
255
255
},
256
256
257
+ cli.BoolFlag {
258
+ Name : "no-detect" ,
259
+ Usage : "Turn off bucket location and signature algorithm autodetection on start" ,
260
+ },
261
+
262
+ cli.BoolFlag {
263
+ Name : "no-expire-multipart" ,
264
+ Usage : "Do not expire multipart uploads older than --multipart-age on start" ,
265
+ },
266
+
257
267
cli.StringFlag {
258
268
Name : "multipart-age" ,
259
269
Usage : "Multipart uploads older than this value will be deleted on start" ,
@@ -947,6 +957,9 @@ func PopulateFlags(c *cli.Context) (ret *FlagStorage) {
947
957
948
958
config .MultipartCopyThreshold = uint64 (c .Int ("multipart-copy-threshold" )) * 1024 * 1024
949
959
960
+ config .NoExpireMultipart = c .Bool ("no-expire-multipart" )
961
+ config .NoDetect = c .Bool ("no-detect" )
962
+
950
963
config .SDKMaxRetries = c .Int ("sdk-max-retries" )
951
964
config .SDKMinRetryDelay = c .Duration ("sdk-min-retry-delay" )
952
965
config .SDKMaxRetryDelay = c .Duration ("sdk-max-retry-delay" )
You can’t perform that action at this time.
0 commit comments