aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordivinerapier <poriter.coco@gmail.com>2019-11-20 08:24:58 +0800
committerdivinerapier <poriter.coco@gmail.com>2019-11-20 08:25:29 +0800
commit5656d43264feea1f39b97d4dba14ce28759fa49f (patch)
tree4d220c504f327ae715db95074639b35da223473a
parent9711a6ffaabdac8516317a5539316e9a2bb83faf (diff)
downloadseaweedfs-5656d43264feea1f39b97d4dba14ce28759fa49f.tar.xz
seaweedfs-5656d43264feea1f39b97d4dba14ce28759fa49f.zip
can not break out of for-select block
Signed-off-by: divinerapier <poriter.coco@gmail.com>
-rw-r--r--weed/topology/topology_vacuum.go10
1 files changed, 4 insertions, 6 deletions
diff --git a/weed/topology/topology_vacuum.go b/weed/topology/topology_vacuum.go
index 37a6a30b9..ff32f1874 100644
--- a/weed/topology/topology_vacuum.go
+++ b/weed/topology/topology_vacuum.go
@@ -35,13 +35,12 @@ func batchVacuumVolumeCheck(grpcDialOption grpc.DialOption, vl *VolumeLayout, vi
}(index, dn.Url(), vid)
}
isCheckSuccess := true
- for _ = range locationlist.list {
+ for range locationlist.list {
select {
case canVacuum := <-ch:
isCheckSuccess = isCheckSuccess && canVacuum
case <-time.After(30 * time.Minute):
- isCheckSuccess = false
- break
+ return false
}
}
return isCheckSuccess
@@ -71,13 +70,12 @@ func batchVacuumVolumeCompact(grpcDialOption grpc.DialOption, vl *VolumeLayout,
}(index, dn.Url(), vid)
}
isVacuumSuccess := true
- for _ = range locationlist.list {
+ for range locationlist.list {
select {
case canCommit := <-ch:
isVacuumSuccess = isVacuumSuccess && canCommit
case <-time.After(30 * time.Minute):
- isVacuumSuccess = false
- break
+ return false
}
}
return isVacuumSuccess