mirrors/seaweedfs
1
0
Fork 0
mirror of https://github.com/chrislusf/seaweedfs synced 2024-09-06 09:00:34 +02:00
Code Issues Projects Releases Wiki Activity

fix variable name

Browse source
This commit is contained in:
Chris Lu 2020-12-12 21:19:40 -08:00
parent 5c465293e9
commit 16cd6fb278
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
weed/server/master_server.go
View file

@ -55,7 +55,7 @@ type MasterServer struct {
vg *topology.VolumeGrowth vg *topology.VolumeGrowth
vgLock sync.Mutex vgLock sync.Mutex
bounedLeaderChan chan int boundedLeaderChan chan int
// notifying clients // notifying clients
clientChansLock sync.RWMutex clientChansLock sync.RWMutex
@ -96,7 +96,7 @@ func NewMasterServer(r *mux.Router, option *MasterOption, peers []string) *Maste
MasterClient: wdclient.NewMasterClient(grpcDialOption, "master", option.Host, 0, "", peers), MasterClient: wdclient.NewMasterClient(grpcDialOption, "master", option.Host, 0, "", peers),
adminLocks: NewAdminLocks(), adminLocks: NewAdminLocks(),
} }
ms.bounedLeaderChan = make(chan int, 16) ms.boundedLeaderChan = make(chan int, 16)
seq := ms.createSequencer(option) seq := ms.createSequencer(option)
if nil == seq { if nil == seq {
@ -157,8 +157,8 @@ func (ms *MasterServer) proxyToLeader(f http.HandlerFunc) http.HandlerFunc {
if ms.Topo.IsLeader() { if ms.Topo.IsLeader() {
f(w, r) f(w, r)
} else if ms.Topo.RaftServer != nil && ms.Topo.RaftServer.Leader() != "" { } else if ms.Topo.RaftServer != nil && ms.Topo.RaftServer.Leader() != "" {
ms.bounedLeaderChan <- 1 ms.boundedLeaderChan <- 1
defer func() { <-ms.bounedLeaderChan }() defer func() { <-ms.boundedLeaderChan }()
targetUrl, err := url.Parse("http://" + ms.Topo.RaftServer.Leader()) targetUrl, err := url.Parse("http://" + ms.Topo.RaftServer.Leader())
if err != nil { if err != nil {
writeJsonError(w, r, http.StatusInternalServerError, writeJsonError(w, r, http.StatusInternalServerError,