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

Feat: support username/password authentication for etcd filer store s… (#4477)

Browse source 
Feat: support username/password authentication for etcd filer store seaweedfs/seaweedfs#4262

Co-authored-by: Mesar Hameed <mesar.hameed@gmail.com>
This commit is contained in:
Mesar Hameed 2023-05-16 01:45:14 +01:00 committed by GitHub
parent 64b2fbe0f1
commit 65484e80ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
weed/command/scaffold/filer.toml
View file

@ -262,6 +262,8 @@ routeByLatency = false
[etcd] [etcd]
enabled = false enabled = false
servers = "localhost:2379" servers = "localhost:2379"
username = ""
password = ""
timeout = "3s" timeout = "3s"
[mongodb] [mongodb]

9
weed/filer/etcd/etcd_store.go
View file

@ -37,15 +37,18 @@ func (store *EtcdStore) Initialize(configuration weed_util.Configuration, prefix
servers = "localhost:2379" servers = "localhost:2379"
} }
username := configuration.GetString(prefix + "username")
password := configuration.GetString(prefix + "password")
timeout := configuration.GetString(prefix + "timeout") timeout := configuration.GetString(prefix + "timeout")
if timeout == "" { if timeout == "" {
timeout = "3s" timeout = "3s"
} }
return store.initialize(servers, timeout) return store.initialize(servers, username, password, timeout)
} }
func (store *EtcdStore) initialize(servers string, timeout string) (err error) { func (store *EtcdStore) initialize(servers string, username string, password string, timeout string) (err error) {
glog.Infof("filer store etcd: %s", servers) glog.Infof("filer store etcd: %s", servers)
to, err := time.ParseDuration(timeout) to, err := time.ParseDuration(timeout)
@ -55,6 +58,8 @@ func (store *EtcdStore) initialize(servers string, timeout string) (err error) {
store.client, err = clientv3.New(clientv3.Config{ store.client, err = clientv3.New(clientv3.Config{
Endpoints: strings.Split(servers, ","), Endpoints: strings.Split(servers, ","),
Username: username,
Password: password,
DialTimeout: to, DialTimeout: to,
}) })
if err != nil { if err != nil {