Konstantin Lebedev
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
1 deletions
-
weed/shell/command_volume_delete_empty.go
-
weed/topology/volume_growth.go
|
|
@ -57,7 +57,7 @@ func (c *commandVolumeDeleteEmpty) Do(args []string, commandEnv *CommandEnv, wri |
|
|
|
eachDataNode(topologyInfo, func(dc string, rack RackId, dn *master_pb.DataNodeInfo) { |
|
|
|
for _, diskInfo := range dn.DiskInfos { |
|
|
|
for _, v := range diskInfo.VolumeInfos { |
|
|
|
if v.Size <= 8 && v.ModifiedAtSecond+quietSeconds < nowUnixSeconds { |
|
|
|
if v.Size <= 8 && v.ModifiedAtSecond > 0 && v.ModifiedAtSecond+quietSeconds < nowUnixSeconds { |
|
|
|
if *applyBalancing { |
|
|
|
log.Printf("deleting empty volume %d from %s", v.Id, dn.Id) |
|
|
|
if deleteErr := deleteVolume(commandEnv.option.GrpcDialOption, needle.VolumeId(v.Id), pb.NewServerAddressFromDataNode(dn)); deleteErr != nil { |
|
|
|
|
|
@ -6,6 +6,7 @@ import ( |
|
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/master_pb" |
|
|
|
"math/rand" |
|
|
|
"sync" |
|
|
|
"time" |
|
|
|
|
|
|
|
"google.golang.org/grpc" |
|
|
|
|
|
|
@ -240,6 +241,7 @@ func (vg *VolumeGrowth) grow(grpcDialOption grpc.DialOption, topo *Topology, vid |
|
|
|
Ttl: option.Ttl, |
|
|
|
Version: needle.CurrentVersion, |
|
|
|
DiskType: option.DiskType.String(), |
|
|
|
ModifiedAtSecond: time.Now().Unix(), |
|
|
|
}) |
|
|
|
glog.V(0).Infof("Created Volume %d on %s", vid, server.NodeImpl.String()) |
|
|
|
} else { |
|
|
|