diff options
| author | askeipx <askeipx@gmail.com> | 2022-08-24 11:18:21 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-23 23:18:21 -0700 |
| commit | 2e78a522ab3892debf9aefeb978177678ae52a83 (patch) | |
| tree | 2f10264a407fb1361c91b3f6a6e9ef06712e477a /weed/command/upload.go | |
| parent | 762dc219a6175d5c81968d817d41a16fb3a1163f (diff) | |
| download | seaweedfs-2e78a522ab3892debf9aefeb978177678ae52a83.tar.xz seaweedfs-2e78a522ab3892debf9aefeb978177678ae52a83.zip | |
remove old raft servers if they don't answer to pings for too long (#3398)
* remove old raft servers if they don't answer to pings for too long
add ping durations as options
rename ping fields
fix some todos
get masters through masterclient
raft remove server from leader
use raft servers to ping them
CheckMastersAlive for hashicorp raft only
* prepare blocking ping
* pass waitForReady as param
* pass waitForReady through all functions
* waitForReady works
* refactor
* remove unneeded params
* rollback unneeded changes
* fix
Diffstat (limited to 'weed/command/upload.go')
| -rw-r--r-- | weed/command/upload.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/weed/command/upload.go b/weed/command/upload.go index 389a72552..1f03f7b5a 100644 --- a/weed/command/upload.go +++ b/weed/command/upload.go @@ -4,11 +4,12 @@ import ( "context" "encoding/json" "fmt" + "os" + "path/filepath" + "github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/pb/master_pb" "google.golang.org/grpc" - "os" - "path/filepath" "github.com/seaweedfs/seaweedfs/weed/operation" "github.com/seaweedfs/seaweedfs/weed/security" @@ -130,7 +131,7 @@ func runUpload(cmd *Command, args []string) bool { } func readMasterConfiguration(grpcDialOption grpc.DialOption, masterAddress pb.ServerAddress) (replication string, err error) { - err = pb.WithMasterClient(false, masterAddress, grpcDialOption, func(client master_pb.SeaweedClient) error { + err = pb.WithMasterClient(false, masterAddress, grpcDialOption, false, func(client master_pb.SeaweedClient) error { resp, err := client.GetMasterConfiguration(context.Background(), &master_pb.GetMasterConfigurationRequest{}) if err != nil { return fmt.Errorf("get master %s configuration: %v", masterAddress, err) |