diff options
| author | wusong <75450248+wusongANKANG@users.noreply.github.com> | 2023-06-06 15:17:51 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-06 00:17:51 -0700 |
| commit | 9bdbf9c880f1d295e55dfdf4dec8c66875c9582f (patch) | |
| tree | 6e5fd963e29ef587f70ed4fbc4de0ef38141614d | |
| parent | 0bffb3770f4096cd8b0eb1be397a9e1372aaeea0 (diff) | |
| download | seaweedfs-9bdbf9c880f1d295e55dfdf4dec8c66875c9582f.tar.xz seaweedfs-9bdbf9c880f1d295e55dfdf4dec8c66875c9582f.zip | |
revert #4491 (#4550)
Co-authored-by: wang wusong <wangwusong@virtaitech.com>
| -rw-r--r-- | weed/topology/node.go | 2 | ||||
| -rw-r--r-- | weed/topology/topology_vacuum.go | 14 |
2 files changed, 0 insertions, 16 deletions
diff --git a/weed/topology/node.go b/weed/topology/node.go index 1380e79f8..1c7e3e468 100644 --- a/weed/topology/node.go +++ b/weed/topology/node.go @@ -248,7 +248,6 @@ func (n *NodeImpl) CollectDeadNodeAndFullVolumes(freshThreshHold int64, volumeSi if n.IsRack() { for _, c := range n.Children() { dn := c.(*DataNode) //can not cast n to DataNode - dn.RLock() for _, v := range dn.GetVolumes() { topo := n.GetTopology() diskType := types.ToDiskType(v.DiskType) @@ -278,7 +277,6 @@ func (n *NodeImpl) CollectDeadNodeAndFullVolumes(freshThreshHold int64, volumeSi } } } - dn.RUnlock() } } else { for _, c := range n.Children() { diff --git a/weed/topology/topology_vacuum.go b/weed/topology/topology_vacuum.go index c8ebdb249..f5b1eaaff 100644 --- a/weed/topology/topology_vacuum.go +++ b/weed/topology/topology_vacuum.go @@ -183,20 +183,6 @@ func (t *Topology) batchVacuumVolumeCommit(grpcDialOption grpc.DialOption, vl *V } 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 vl.accessLock.Lock() |