gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

tiered storage: add s3 endpoint for private s3 implementation

Browse source 
fix https://github.com/chrislusf/seaweedfs/issues/1238
This commit is contained in:
Chris Lu 2020-03-19 21:13:56 -07:00
parent d848d08944
commit 709f231e23
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
weed/command/scaffold.go
View file

@ -380,6 +380,7 @@ sequencer_etcd_urls = "http://127.0.0.1:2379"
aws_secret_access_key = "" # if empty, loads from the shared credentials file (~/.aws/credentials). aws_secret_access_key = "" # if empty, loads from the shared credentials file (~/.aws/credentials).
region = "us-east-2" region = "us-east-2"
bucket = "your_bucket_name" # an existing bucket bucket = "your_bucket_name" # an existing bucket
endpoint = ""
# create this number of logical volumes if no more writable volumes # create this number of logical volumes if no more writable volumes
# count_x means how many copies of data. # count_x means how many copies of data.

6
weed/storage/backend/s3_backend/s3_backend.go
View file

@ -36,6 +36,7 @@ type S3BackendStorage struct {
aws_secret_access_key string aws_secret_access_key string
region string region string
bucket string bucket string
endpoint string
conn s3iface.S3API conn s3iface.S3API
} }
@ -46,7 +47,9 @@ func newS3BackendStorage(configuration backend.StringProperties, configPrefix st
s.aws_secret_access_key = configuration.GetString(configPrefix + "aws_secret_access_key") s.aws_secret_access_key = configuration.GetString(configPrefix + "aws_secret_access_key")
s.region = configuration.GetString(configPrefix + "region") s.region = configuration.GetString(configPrefix + "region")
s.bucket = configuration.GetString(configPrefix + "bucket") s.bucket = configuration.GetString(configPrefix + "bucket")
s.conn, err = createSession(s.aws_access_key_id, s.aws_secret_access_key, s.region) s.endpoint = configuration.GetString(configPrefix + "endpoint")
s.conn, err = createSession(s.aws_access_key_id, s.aws_secret_access_key, s.region, s.endpoint)
glog.V(0).Infof("created backend storage s3.%s for region %s bucket %s", s.id, s.region, s.bucket) glog.V(0).Infof("created backend storage s3.%s for region %s bucket %s", s.id, s.region, s.bucket)
return return
@ -58,6 +61,7 @@ func (s *S3BackendStorage) ToProperties() map[string]string {
m["aws_secret_access_key"] = s.aws_secret_access_key m["aws_secret_access_key"] = s.aws_secret_access_key
m["region"] = s.region m["region"] = s.region
m["bucket"] = s.bucket m["bucket"] = s.bucket
m["endpoint"] = s.endpoint
return m return m
} }

3
weed/storage/backend/s3_backend/s3_sessions.go
View file

@ -24,7 +24,7 @@ func getSession(region string) (s3iface.S3API, bool) {
return sess, found return sess, found
} }
func createSession(awsAccessKeyId, awsSecretAccessKey, region string) (s3iface.S3API, error) { func createSession(awsAccessKeyId, awsSecretAccessKey, region, endpoint string) (s3iface.S3API, error) {
sessionsLock.Lock() sessionsLock.Lock()
defer sessionsLock.Unlock() defer sessionsLock.Unlock()
@ -35,6 +35,7 @@ func createSession(awsAccessKeyId, awsSecretAccessKey, region string) (s3iface.S
config := &aws.Config{ config := &aws.Config{
Region: aws.String(region), Region: aws.String(region),
Endpoint: aws.String(endpoint),
} }
if awsAccessKeyId != "" && awsSecretAccessKey != "" { if awsAccessKeyId != "" && awsSecretAccessKey != "" {
config.Credentials = credentials.NewStaticCredentials(awsAccessKeyId, awsSecretAccessKey, "") config.Credentials = credentials.NewStaticCredentials(awsAccessKeyId, awsSecretAccessKey, "")