gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "master: rename grpc function KeepConnected() to SubscribeVolumeLocationUpdates()"

Browse Source 
This reverts commit af71ae11aa.
This commit is contained in:
Chris Lu
2021-11-05 17:52:15 -07:00
parent 314c32514b
commit 5ea86ef1da
16 changed files with 687 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
weed/wdclient/masterclient.go
View File

@@ -44,7 +44,7 @@ func (mc *MasterClient) WaitUntilConnected() {
}
}
func (mc *MasterClient) LoopConnectToMaster() {
func (mc *MasterClient) KeepConnectedToMaster() {
glog.V(1).Infof("%s masterClient bootstraps with masters %v", mc.clientType, mc.masters)
for {
mc.tryAllMasters()
@@ -99,13 +99,13 @@ func (mc *MasterClient) tryConnectToMaster(master pb.ServerAddress) (nextHintedL
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
stream, err := client.SubscribeVolumeLocationUpdates(ctx)
stream, err := client.KeepConnected(ctx)
if err != nil {
glog.V(1).Infof("%s masterClient failed to keep connected to %s: %v", mc.clientType, master, err)
return err
}
if err = stream.Send(&master_pb.SubscribeVolumeLocationUpdatesRequest{
if err = stream.Send(&master_pb.KeepConnectedRequest{
ClientType: mc.clientType,
ClientAddress: string(mc.clientHost),
Version: util.Version(),