LumeWeb
/
tusd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moving MaxObjectSize check to top

This commit is contained in:
Markus Kienast 2017-08-26 12:03:18 +02:00
parent 68e6bb8c41
commit 93134a5696
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
s3store/s3store.go
View File

@ -562,6 +562,11 @@ func isAwsError(err error, code string) bool {
} }
func (store S3Store) CalcOptimalPartSize(size int64) (optimalPartSize int64, err error) { func (store S3Store) CalcOptimalPartSize(size int64) (optimalPartSize int64, err error) {
// an upload larger than MaxObjectSize must throw an error
if size > store.MaxObjectSize {
return 0, fmt.Errorf("CalcOptimalPartSize: upload size of %v bytes exceeds MaxObjectSize of %v bytes", size, store.MaxObjectSize)
}
switch { switch {
// When upload is smaller or equal MinPartSize, we upload in just one part. // When upload is smaller or equal MinPartSize, we upload in just one part.
case size <= store.MinPartSize: case size <= store.MinPartSize:
@ -598,10 +603,6 @@ func (store S3Store) CalcOptimalPartSize(size int64) (optimalPartSize int64, err
optimalPartSize = size/store.MaxMultipartParts + 1 optimalPartSize = size/store.MaxMultipartParts + 1
} }
// an upload larger than MaxObjectSize must throw an error
if size > store.MaxObjectSize {
return optimalPartSize, fmt.Errorf("CalcOptimalPartSize: upload size of %v bytes exceeds MaxObjectSize of %v bytes", size, store.MaxObjectSize)
}
// optimalPartSize must never exceed MaxPartSize // optimalPartSize must never exceed MaxPartSize
if optimalPartSize > store.MaxPartSize { if optimalPartSize > store.MaxPartSize {
return optimalPartSize, fmt.Errorf("CalcOptimalPartSize: to upload %v bytes optimalPartSize %v must exceed MaxPartSize %v", size, optimalPartSize, store.MaxPartSize) return optimalPartSize, fmt.Errorf("CalcOptimalPartSize: to upload %v bytes optimalPartSize %v must exceed MaxPartSize %v", size, optimalPartSize, store.MaxPartSize)