diff options
| author | chrislu <chris.lu@gmail.com> | 2022-08-18 02:39:07 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-08-18 02:39:07 -0700 |
| commit | 4d72a1ce6e1cf7f6def12d933f9333bab9a6e9b5 (patch) | |
| tree | d32441ff0efca726fe63016f45ae9830a3c9bd05 | |
| parent | 42c6e5251363f0437f22eace84589856ff06f669 (diff) | |
| download | seaweedfs-4d72a1ce6e1cf7f6def12d933f9333bab9a6e9b5.tar.xz seaweedfs-4d72a1ce6e1cf7f6def12d933f9333bab9a6e9b5.zip | |
s3: remove deleted collection during metrics reporting
fix https://github.com/seaweedfs/seaweedfs/issues/3453
| -rw-r--r-- | weed/storage/store.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/weed/storage/store.go b/weed/storage/store.go index d45b0d95e..ae0cfb31b 100644 --- a/weed/storage/store.go +++ b/weed/storage/store.go @@ -227,7 +227,7 @@ func (s *Store) CollectHeartbeat() *master_pb.Heartbeat { var volumeMessages []*master_pb.VolumeInformationMessage maxVolumeCounts := make(map[string]uint32) var maxFileKey NeedleId - collectionVolumeSize := make(map[string]uint64) + collectionVolumeSize := make(map[string]int64) collectionVolumeReadOnlyCount := make(map[string]map[string]uint8) for _, location := range s.Locations { var deleteVids []needle.VolumeId @@ -262,11 +262,11 @@ func (s *Store) CollectHeartbeat() *master_pb.Heartbeat { collectionVolumeSize[v.Collection] = 0 } if !shouldDeleteVolume { - collectionVolumeSize[v.Collection] += volumeMessage.Size + collectionVolumeSize[v.Collection] += int64(volumeMessage.Size) } else { - collectionVolumeSize[v.Collection] -= volumeMessage.Size - if collectionVolumeSize[v.Collection] < 0 { - collectionVolumeSize[v.Collection] = 0 + collectionVolumeSize[v.Collection] -= int64(volumeMessage.Size) + if collectionVolumeSize[v.Collection] <= 0 { + delete(collectionVolumeSize, v.Collection) } } |
