Browse Source
Co-authored-by: wang wusong <wangwusong@virtaitech.com>
pull/4554/head
wusong
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
0 additions and
16 deletions
-
weed/topology/node.go
-
weed/topology/topology_vacuum.go
|
|
@ -248,7 +248,6 @@ func (n *NodeImpl) CollectDeadNodeAndFullVolumes(freshThreshHold int64, volumeSi |
|
|
if n.IsRack() { |
|
|
if n.IsRack() { |
|
|
for _, c := range n.Children() { |
|
|
for _, c := range n.Children() { |
|
|
dn := c.(*DataNode) //can not cast n to DataNode
|
|
|
dn := c.(*DataNode) //can not cast n to DataNode
|
|
|
dn.RLock() |
|
|
|
|
|
for _, v := range dn.GetVolumes() { |
|
|
for _, v := range dn.GetVolumes() { |
|
|
topo := n.GetTopology() |
|
|
topo := n.GetTopology() |
|
|
diskType := types.ToDiskType(v.DiskType) |
|
|
diskType := types.ToDiskType(v.DiskType) |
|
|
@ -278,7 +277,6 @@ func (n *NodeImpl) CollectDeadNodeAndFullVolumes(freshThreshHold int64, volumeSi |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
dn.RUnlock() |
|
|
|
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
for _, c := range n.Children() { |
|
|
for _, c := range n.Children() { |
|
|
|
|
|
@ -183,20 +183,6 @@ func (t *Topology) batchVacuumVolumeCommit(grpcDialOption grpc.DialOption, vl *V |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if isCommitSuccess { |
|
|
if isCommitSuccess { |
|
|
//reset all vacuumed volumes size
|
|
|
|
|
|
for _, dn := range vacuumLocationList.list { |
|
|
|
|
|
vInfo, err := dn.GetVolumesById(vid) |
|
|
|
|
|
if err != nil { |
|
|
|
|
|
glog.V(0).Infof("get volume info for volume: %d failed %v", vid, err) |
|
|
|
|
|
return false |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
dn.Lock() |
|
|
|
|
|
disk := dn.getOrCreateDisk(vInfo.DiskType) |
|
|
|
|
|
vInfo.Size = 0 |
|
|
|
|
|
disk.doAddOrUpdateVolume(vInfo) |
|
|
|
|
|
dn.Unlock() |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//record vacuum time of volume
|
|
|
//record vacuum time of volume
|
|
|
vl.accessLock.Lock() |
|
|
vl.accessLock.Lock() |
|
|
|
