Merge branch 'new_master' into ydb

# Conflicts:
#	go.mod
#	go.sum

1 files changed, 7 insertions, 1 deletions

diff --git a/weed/storage/backend/s3_backend/s3_backend.go b/weed/storage/backend/s3_backend/s3_backend.go
index 58867b421..b516062a8 100644
--- a/weed/storage/backend/s3_backend/s3_backend.go
+++ b/weed/storage/backend/s3_backend/s3_backend.go
@@ -37,6 +37,7 @@ type S3BackendStorage struct {
 	region                string
 	bucket                string
 	endpoint              string
+	storageClass          string
 	conn                  s3iface.S3API
 }
 
@@ -48,6 +49,10 @@ func newS3BackendStorage(configuration backend.StringProperties, configPrefix st
 	s.region = configuration.GetString(configPrefix + "region")
 	s.bucket = configuration.GetString(configPrefix + "bucket")
 	s.endpoint = configuration.GetString(configPrefix + "endpoint")
+	s.storageClass = configuration.GetString(configPrefix + "storageClass")
+	if s.storageClass == "" {
+		s.storageClass = "STANDARD_IA"
+	}
 
 	s.conn, err = createSession(s.aws_access_key_id, s.aws_secret_access_key, s.region, s.endpoint)
 
@@ -62,6 +67,7 @@ func (s *S3BackendStorage) ToProperties() map[string]string {
 	m["region"] = s.region
 	m["bucket"] = s.bucket
 	m["endpoint"] = s.endpoint
+	m["storage_class"] = s.storageClass
 	return m
 }
 
@@ -85,7 +91,7 @@ func (s *S3BackendStorage) CopyFile(f *os.File, fn func(progressed int64, percen
 
 	glog.V(1).Infof("copying dat file of %s to remote s3.%s as %s", f.Name(), s.id, key)
 
-	size, err = uploadToS3(s.conn, f.Name(), s.bucket, key, fn)
+	size, err = uploadToS3(s.conn, f.Name(), s.bucket, key, s.storageClass, fn)
 
 	return
 }