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

treat it as a single node cluster if empty raft server name

Browse Source 
possible fix for https://github.com/chrislusf/seaweedfs/issues/1118
This commit is contained in:
Chris Lu
2020-01-10 00:37:44 -08:00
parent 30c7148020
commit d1ab16b6e3
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
weed/topology/topology.go
View File

@@ -60,7 +60,12 @@ func NewTopology(id string, seq sequence.Sequencer, volumeSizeLimit uint64, puls
func (t *Topology) IsLeader() bool { func (t *Topology) IsLeader() bool {
if t.RaftServer != nil { if t.RaftServer != nil {
return t.RaftServer.State() == raft.Leader if t.RaftServer.State() == raft.Leader {
return true
}
if t.RaftServer.Leader() == "" {
return true
}
} }
return false return false
} }
@@ -75,7 +80,7 @@ func (t *Topology) Leader() (string, error) {
if l == "" { if l == "" {
// We are a single node cluster, we are the leader // We are a single node cluster, we are the leader
return t.RaftServer.Name(), errors.New("Raft Server not initialized!") return t.RaftServer.Name(), nil
} }
return l, nil return l, nil
@@ -152,7 +157,7 @@ func (t *Topology) ListCollections(includeNormalVolumes, includeEcVolumes bool)
t.ecShardMapLock.RUnlock() t.ecShardMapLock.RUnlock()
} }
for k, _ := range mapOfCollections { for k := range mapOfCollections {
ret = append(ret, k) ret = append(ret, k)
} }
return ret return ret