gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/chrislusf/seaweedfs

Browse source
This commit is contained in:
Chris Lu 2019-02-25 00:34:25 -08:00
parent 0d84e32f56 47bf0e3eae
commit c892b898a1
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
weed/topology/topology.go
View file

@ -88,11 +88,13 @@ func (t *Topology) Lookup(collection string, vid storage.VolumeId) []*DataNode {
return nil return nil
} }
func (t *Topology) NextVolumeId() storage.VolumeId { func (t *Topology) NextVolumeId() (storage.VolumeId, error) {
vid := t.GetMaxVolumeId() vid := t.GetMaxVolumeId()
next := vid.Next() next := vid.Next()
go t.RaftServer.Do(NewMaxVolumeIdCommand(next)) if _, err := t.RaftServer.Do(NewMaxVolumeIdCommand(next)); err != nil {
return next return 0, err
}
return next, nil
} }
func (t *Topology) HasWritableVolume(option *VolumeGrowOption) bool { func (t *Topology) HasWritableVolume(option *VolumeGrowOption) bool {

5
weed/topology/volume_growth.go
View file

@ -82,7 +82,10 @@ func (vg *VolumeGrowth) findAndGrow(grpcDialOption grpc.DialOption, topo *Topolo
if e != nil { if e != nil {
return 0, e return 0, e
} }
vid := topo.NextVolumeId() vid, raftErr := topo.NextVolumeId()
if raftErr != nil {
return 0, raftErr
}
err := vg.grow(grpcDialOption, topo, vid, option, servers...) err := vg.grow(grpcDialOption, topo, vid, option, servers...)
return len(servers), err return len(servers), err
} }