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

wait for goroutines

Browse source
This commit is contained in:
Chris Lu 2021-08-10 04:13:08 -07:00
parent 1098ed0d78
commit 85832d02c0
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
weed/shell/command_volume_tier_move.go
View file

@ -109,6 +109,7 @@ func (c *commandVolumeTierMove) doVolumeTierMove(commandEnv *CommandEnv, writer
hasFoundTarget := false hasFoundTarget := false
keepDataNodesSorted(allLocations, toDiskType) keepDataNodesSorted(allLocations, toDiskType)
fn := capacityByFreeVolumeCount(toDiskType) fn := capacityByFreeVolumeCount(toDiskType)
wg := sync.WaitGroup{}
for _, dst := range allLocations { for _, dst := range allLocations {
if fn(dst.dataNode) > 0 && !hasFoundTarget { if fn(dst.dataNode) > 0 && !hasFoundTarget {
// ask the volume server to replicate the volume // ask the volume server to replicate the volume
@ -145,6 +146,7 @@ func (c *commandVolumeTierMove) doVolumeTierMove(commandEnv *CommandEnv, writer
c.activeServers[dst.dataNode.Id] = struct{}{} c.activeServers[dst.dataNode.Id] = struct{}{}
c.activeServersCond.L.Unlock() c.activeServersCond.L.Unlock()
wg.Add(1)
go func(dst location) { go func(dst location) {
if err := c.doMoveOneVolume(commandEnv, writer, vid, toDiskType, locations, sourceVolumeServer, dst); err != nil { if err := c.doMoveOneVolume(commandEnv, writer, vid, toDiskType, locations, sourceVolumeServer, dst); err != nil {
fmt.Fprintf(writer, "move volume %d %s => %s: %v\n", vid, sourceVolumeServer, dst.dataNode.Id, err) fmt.Fprintf(writer, "move volume %d %s => %s: %v\n", vid, sourceVolumeServer, dst.dataNode.Id, err)
@ -152,11 +154,14 @@ func (c *commandVolumeTierMove) doVolumeTierMove(commandEnv *CommandEnv, writer
delete(c.activeServers, sourceVolumeServer) delete(c.activeServers, sourceVolumeServer)
delete(c.activeServers, dst.dataNode.Id) delete(c.activeServers, dst.dataNode.Id)
c.activeServersCond.Signal() c.activeServersCond.Signal()
wg.Done()
}(dst) }(dst)
} }
} }
wg.Wait()
if !hasFoundTarget { if !hasFoundTarget {
fmt.Fprintf(writer, "can not find disk type %s for volume %d\n", toDiskType.ReadableString(), vid) fmt.Fprintf(writer, "can not find disk type %s for volume %d\n", toDiskType.ReadableString(), vid)
} }