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 #2228 from combineads/master

Browse source
This commit is contained in:
Chris Lu 2021-08-01 19:46:00 -07:00 committed by GitHub
parent 56ee1d5ef1 9e839cb5cc
commit 02fd913b51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
weed/shell/command_volume_delete_empty.go
View file

@ -3,11 +3,10 @@ package shell
import ( import (
"flag" "flag"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb" "github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
"io" "io"
"log" "log"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
) )
func init() { func init() {
@ -24,7 +23,7 @@ func (c *commandVolumeDeleteEmpty) Name() string {
func (c *commandVolumeDeleteEmpty) Help() string { func (c *commandVolumeDeleteEmpty) Help() string {
return `delete empty volumes from all volume servers return `delete empty volumes from all volume servers
volume.deleteEmpty -quietFor=24h volume.deleteEmpty -quietFor=24h -force
This command deletes all empty volumes from one volume server. This command deletes all empty volumes from one volume server.
@ -39,6 +38,7 @@ func (c *commandVolumeDeleteEmpty) Do(args []string, commandEnv *CommandEnv, wri
volDeleteCommand := flag.NewFlagSet(c.Name(), flag.ContinueOnError) volDeleteCommand := flag.NewFlagSet(c.Name(), flag.ContinueOnError)
quietPeriod := volDeleteCommand.Duration("quietFor", 24*time.Hour, "select empty volumes with no recent writes, avoid newly created ones") quietPeriod := volDeleteCommand.Duration("quietFor", 24*time.Hour, "select empty volumes with no recent writes, avoid newly created ones")
applyBalancing := volDeleteCommand.Bool("force", false, "apply to delete empty volumes")
if err = volDeleteCommand.Parse(args); err != nil { if err = volDeleteCommand.Parse(args); err != nil {
return nil return nil
} }
@ -55,10 +55,15 @@ func (c *commandVolumeDeleteEmpty) Do(args []string, commandEnv *CommandEnv, wri
eachDataNode(topologyInfo, func(dc string, rack RackId, dn *master_pb.DataNodeInfo) { eachDataNode(topologyInfo, func(dc string, rack RackId, dn *master_pb.DataNodeInfo) {
for _, diskInfo := range dn.DiskInfos { for _, diskInfo := range dn.DiskInfos {
for _, v := range diskInfo.VolumeInfos { for _, v := range diskInfo.VolumeInfos {
if v.Size <= 8 && v.ModifiedAtSecond + quietSeconds < nowUnixSeconds { if v.Size <= 8 && v.ModifiedAtSecond+quietSeconds < nowUnixSeconds {
log.Printf("deleting empty volume %d from %s", v.Id, dn.Id) if *applyBalancing {
if deleteErr := deleteVolume(commandEnv.option.GrpcDialOption, needle.VolumeId(v.Id), dn.Id); deleteErr != nil { log.Printf("deleting empty volume %d from %s", v.Id, dn.Id)
err = deleteErr if deleteErr := deleteVolume(commandEnv.option.GrpcDialOption, needle.VolumeId(v.Id), dn.Id); deleteErr != nil {
err = deleteErr
}
continue
} else {
log.Printf("empty volume %d from %s", v.Id, dn.Id)
} }
} }
} }