lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-09-19 10:37:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

change server address from string to a type

Browse Source
This commit is contained in:
Chris Lu
2021-09-12 22:47:52 -07:00
parent 2c9d4c8f43
commit e5fc35ed0c
128 changed files with 2138 additions and 2082 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
weed/topology/topology.go
View File

@@ -3,6 +3,7 @@ package topology
import (
"errors"
"fmt"
"github.com/chrislusf/seaweedfs/weed/pb"
"github.com/chrislusf/seaweedfs/weed/storage/types"
"math/rand"
"sync"
@@ -71,7 +72,7 @@ func (t *Topology) IsLeader() bool {
return true
}
if leader, err := t.Leader(); err == nil {
if t.RaftServer.Name() == leader {
if pb.ServerAddress(t.RaftServer.Name()) == leader {
return true
}
}
@@ -79,11 +80,11 @@ func (t *Topology) IsLeader() bool {
return false
}
func (t *Topology) Leader() (string, error) {
l := ""
func (t *Topology) Leader() (pb.ServerAddress, error) {
var l pb.ServerAddress
for count := 0; count < 3; count++ {
if t.RaftServer != nil {
l = t.RaftServer.Leader()
l = pb.ServerAddress(t.RaftServer.Leader())
} else {
return "", errors.New("Raft Server not ready yet!")
}