diff options
| author | Chris Lu <chris.lu@gmail.com> | 2021-08-03 01:30:35 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2021-08-03 01:30:35 -0700 |
| commit | 3afbf04007eb1e6c7d79e652545d24e7a8e7d509 (patch) | |
| tree | 48c1a90f0128f1f4e2e8a5b21ab681ad1e168bd6 | |
| parent | fe60c6ef9a09f2190926a49aaf3c15ab29bf5812 (diff) | |
| download | seaweedfs-3afbf04007eb1e6c7d79e652545d24e7a8e7d509.tar.xz seaweedfs-3afbf04007eb1e6c7d79e652545d24e7a8e7d509.zip | |
add TLS grpc support for filer meta clients
| -rw-r--r-- | weed/command/filer_backup.go | 4 | ||||
| -rw-r--r-- | weed/command/filer_meta_backup.go | 1 | ||||
| -rw-r--r-- | weed/command/filer_meta_tail.go | 1 | ||||
| -rw-r--r-- | weed/command/filer_sync.go | 1 | ||||
| -rw-r--r-- | weed/command/iam.go | 1 |
5 files changed, 6 insertions, 2 deletions
diff --git a/weed/command/filer_backup.go b/weed/command/filer_backup.go index 888b46fe7..fc4dd8298 100644 --- a/weed/command/filer_backup.go +++ b/weed/command/filer_backup.go @@ -52,11 +52,11 @@ var cmdFilerBackup = &Command{ func runFilerBackup(cmd *Command, args []string) bool { - grpcDialOption := security.LoadClientTLS(util.GetViper(), "grpc.client") - util.LoadConfiguration("security", false) util.LoadConfiguration("replication", true) + grpcDialOption := security.LoadClientTLS(util.GetViper(), "grpc.client") + for { err := doFilerBackup(grpcDialOption, &filerBackupOptions) if err != nil { diff --git a/weed/command/filer_meta_backup.go b/weed/command/filer_meta_backup.go index ba0b44659..28bd367e7 100644 --- a/weed/command/filer_meta_backup.go +++ b/weed/command/filer_meta_backup.go @@ -53,6 +53,7 @@ The backup writes to another filer store specified in a backup_filer.toml. func runFilerMetaBackup(cmd *Command, args []string) bool { + util.LoadConfiguration("security", false) metaBackup.grpcDialOption = security.LoadClientTLS(util.GetViper(), "grpc.client") // load backup_filer.toml diff --git a/weed/command/filer_meta_tail.go b/weed/command/filer_meta_tail.go index 8451ffd78..76699bb5e 100644 --- a/weed/command/filer_meta_tail.go +++ b/weed/command/filer_meta_tail.go @@ -45,6 +45,7 @@ var ( func runFilerMetaTail(cmd *Command, args []string) bool { + util.LoadConfiguration("security", false) grpcDialOption := security.LoadClientTLS(util.GetViper(), "grpc.client") var filterFunc func(dir, fname string) bool diff --git a/weed/command/filer_sync.go b/weed/command/filer_sync.go index 211c34aea..7cfc8a7fe 100644 --- a/weed/command/filer_sync.go +++ b/weed/command/filer_sync.go @@ -89,6 +89,7 @@ var cmdFilerSynchronize = &Command{ func runFilerSynchronize(cmd *Command, args []string) bool { + util.LoadConfiguration("security", false) grpcDialOption := security.LoadClientTLS(util.GetViper(), "grpc.client") grace.SetupProfiling(*syncCpuProfile, *syncMemProfile) diff --git a/weed/command/iam.go b/weed/command/iam.go index 17d0832cb..ed4eea543 100644 --- a/weed/command/iam.go +++ b/weed/command/iam.go @@ -49,6 +49,7 @@ func (iamopt *IamOptions) startIamServer() bool { return false } + util.LoadConfiguration("security", false) grpcDialOption := security.LoadClientTLS(util.GetViper(), "grpc.client") for { err = pb.WithGrpcFilerClient(filerGrpcAddress, grpcDialOption, func(client filer_pb.SeaweedFilerClient) error { |