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 pull request #1129 from divinerapier/master

Browse source 
can not break out of from for-select block
This commit is contained in:
Chris Lu 2019-11-19 20:43:05 -08:00 committed by GitHub
parent 9711a6ffaa 5656d43264
commit 4f3adcb5ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
weed/topology/topology_vacuum.go
View file

@ -35,13 +35,12 @@ func batchVacuumVolumeCheck(grpcDialOption grpc.DialOption, vl *VolumeLayout, vi
}(index, dn.Url(), vid) }(index, dn.Url(), vid)
} }
isCheckSuccess := true isCheckSuccess := true
for _ = range locationlist.list { for range locationlist.list {
select { select {
case canVacuum := <-ch: case canVacuum := <-ch:
isCheckSuccess = isCheckSuccess && canVacuum isCheckSuccess = isCheckSuccess && canVacuum
case <-time.After(30 * time.Minute): case <-time.After(30 * time.Minute):
isCheckSuccess = false return false
break
} }
} }
return isCheckSuccess return isCheckSuccess
@ -71,13 +70,12 @@ func batchVacuumVolumeCompact(grpcDialOption grpc.DialOption, vl *VolumeLayout,
}(index, dn.Url(), vid) }(index, dn.Url(), vid)
} }
isVacuumSuccess := true isVacuumSuccess := true
for _ = range locationlist.list { for range locationlist.list {
select { select {
case canCommit := <-ch: case canCommit := <-ch:
isVacuumSuccess = isVacuumSuccess && canCommit isVacuumSuccess = isVacuumSuccess && canCommit
case <-time.After(30 * time.Minute): case <-time.After(30 * time.Minute):
isVacuumSuccess = false return false
break
} }
} }
return isVacuumSuccess return isVacuumSuccess