mirror/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-01-18 06:30:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3286 from duanhongyi/master

Browse Source 
filer tikv support tls
This commit is contained in:
Chris Lu 2022-07-07 23:47:56 -07:00 committed by GitHub
commit d6a5441391
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
weed/command/scaffold/filer.toml
View File

@ -337,3 +337,11 @@ pdaddrs = "localhost:2379"
deleterange_concurrency = 1 deleterange_concurrency = 1
# Enable 1PC # Enable 1PC
enable_1pc = false enable_1pc = false
# Set the CA certificate path
ca_path=""
# Set the certificate path
cert_path=""
# Set the private key path
key_path=""
# The name list used to verify the cn name
verify_cn=""

19
weed/filer/tikv/tikv_store.go
View File

@ -15,6 +15,7 @@ import (
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/util"
"github.com/tikv/client-go/v2/config"
"github.com/tikv/client-go/v2/txnkv" "github.com/tikv/client-go/v2/txnkv"
) )
@ -38,21 +39,25 @@ func (store *TikvStore) GetName() string {
} }
func (store *TikvStore) Initialize(config util.Configuration, prefix string) error { func (store *TikvStore) Initialize(config util.Configuration, prefix string) error {
pdAddrs := []string{} ca := config.GetString(prefix + "ca_path")
pdAddrsStr := config.GetString(prefix + "pdaddrs") cert := config.GetString(prefix + "cert_path")
for _, item := range strings.Split(pdAddrsStr, ",") { key := config.GetString(prefix + "key_path")
pdAddrs = append(pdAddrs, strings.TrimSpace(item)) verify_cn := strings.Split(config.GetString(prefix+"verify_cn"), ",")
} pdAddrs := strings.Split(config.GetString(prefix+"pdaddrs"), ",")
drc := config.GetInt(prefix + "deleterange_concurrency") drc := config.GetInt(prefix + "deleterange_concurrency")
if drc <= 0 { if drc <= 0 {
drc = 1 drc = 1
} }
store.onePC = config.GetBool(prefix + "enable_1pc") store.onePC = config.GetBool(prefix + "enable_1pc")
store.deleteRangeConcurrency = drc store.deleteRangeConcurrency = drc
return store.initialize(pdAddrs) return store.initialize(ca, cert, key, verify_cn, pdAddrs)
} }
func (store *TikvStore) initialize(pdAddrs []string) error { func (store *TikvStore) initialize(ca, cert, key string, verify_cn, pdAddrs []string) error {
config.UpdateGlobal(func(conf *config.Config) {
conf.Security = config.NewSecurity(ca, cert, key, verify_cn)
})
client, err := txnkv.NewClient(pdAddrs) client, err := txnkv.NewClient(pdAddrs)
store.client = client store.client = client
return err return err