From 4d72a1ce6e1cf7f6def12d933f9333bab9a6e9b5 Mon Sep 17 00:00:00 2001 From: chrislu Date: Thu, 18 Aug 2022 02:39:07 -0700 Subject: [PATCH] s3: remove deleted collection during metrics reporting fix https://github.com/seaweedfs/seaweedfs/issues/3453 --- weed/storage/store.go | 10 +++++----- 1 file 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) } }