diff options
| -rw-r--r-- | weed/shell/command_volume_vacuum.go | 4 | ||||
| -rw-r--r-- | weed/topology/topology_vacuum.go | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/weed/shell/command_volume_vacuum.go b/weed/shell/command_volume_vacuum.go index 637411945..fc454c9ff 100644 --- a/weed/shell/command_volume_vacuum.go +++ b/weed/shell/command_volume_vacuum.go @@ -22,7 +22,7 @@ func (c *commandVacuum) Name() string { func (c *commandVacuum) Help() string { return `compact volumes if deleted entries are more than the limit - volume.vacuum [-garbageThreshold=0.3] + volume.vacuum [-garbageThreshold=0.3] [-collection=<collection name>] [-volumeId=<volume id>] ` } @@ -32,7 +32,7 @@ func (c *commandVacuum) Do(args []string, commandEnv *CommandEnv, writer io.Writ volumeVacuumCommand := flag.NewFlagSet(c.Name(), flag.ContinueOnError) garbageThreshold := volumeVacuumCommand.Float64("garbageThreshold", 0.3, "vacuum when garbage is more than this limit") collection := volumeVacuumCommand.String("collection", "", "vacuum this collection") - volumeId := volumeVacuumCommand.Int("volumeId", 0, "the volume id") + volumeId := volumeVacuumCommand.Uint("volumeId", 0, "the volume id") if err = volumeVacuumCommand.Parse(args); err != nil { return } diff --git a/weed/topology/topology_vacuum.go b/weed/topology/topology_vacuum.go index 7e030e5ac..147220f4a 100644 --- a/weed/topology/topology_vacuum.go +++ b/weed/topology/topology_vacuum.go @@ -185,20 +185,20 @@ func (t *Topology) Vacuum(grpcDialOption grpc.DialOption, garbageThreshold float for _, vl := range c.storageType2VolumeLayout.Items() { if vl != nil { volumeLayout := vl.(*VolumeLayout) - t.vacuumOneVolumeLayout(grpcDialOption, volumeLayout, c, garbageThreshold, volumeId, preallocate) + if volumeId > 0 && volumeLayout.Lookup(needle.VolumeId(volumeId)) == nil { + continue + } + t.vacuumOneVolumeLayout(grpcDialOption, volumeLayout, c, garbageThreshold, preallocate) } } } } -func (t *Topology) vacuumOneVolumeLayout(grpcDialOption grpc.DialOption, volumeLayout *VolumeLayout, c *Collection, garbageThreshold float64, volumeId uint32, preallocate int64) { +func (t *Topology) vacuumOneVolumeLayout(grpcDialOption grpc.DialOption, volumeLayout *VolumeLayout, c *Collection, garbageThreshold float64, preallocate int64) { volumeLayout.accessLock.RLock() tmpMap := make(map[needle.VolumeId]*VolumeLocationList) for vid, locationList := range volumeLayout.vid2location { - if volumeId > 0 && volumeId != uint32(vid) { - continue - } tmpMap[vid] = locationList.Copy() } volumeLayout.accessLock.RUnlock() |