diff options
| author | Evgeny Kuzhelev <askeipx@gmail.com> | 2022-07-27 13:55:09 +0500 |
|---|---|---|
| committer | Evgeny Kuzhelev <askeipx@gmail.com> | 2022-07-27 15:02:41 +0500 |
| commit | 709c83716cbc1877510d0836ab1194eb28c99761 (patch) | |
| tree | 1f43094d66338235511e05fa8e87a1ba72a26768 | |
| parent | f401b996eb421294920fe048df5b1b646a558324 (diff) | |
| download | seaweedfs-709c83716cbc1877510d0836ab1194eb28c99761.tar.xz seaweedfs-709c83716cbc1877510d0836ab1194eb28c99761.zip | |
delete disk_size metrics when collection deleted
| -rw-r--r-- | weed/storage/store.go | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/weed/storage/store.go b/weed/storage/store.go index f833f1b15..8ab8b994c 100644 --- a/weed/storage/store.go +++ b/weed/storage/store.go @@ -101,6 +101,7 @@ func (s *Store) DeleteCollection(collection string) (e error) { if e != nil { return } + stats.VolumeServerDiskSizeGauge.DeleteLabelValues(collection, "normal") // let the heartbeat send the list of volumes, instead of sending the deleted volume ids to DeletedVolumesChan } return @@ -240,19 +241,19 @@ func (s *Store) CollectHeartbeat() *master_pb.Heartbeat { if maxFileKey < curMaxFileKey { maxFileKey = curMaxFileKey } - deleteVolume := false + shouldDeleteVolume := false if !v.expired(volumeMessage.Size, s.GetVolumeSizeLimit()) { volumeMessages = append(volumeMessages, volumeMessage) } else { if v.expiredLongEnough(MAX_TTL_VOLUME_REMOVAL_DELAY) { deleteVids = append(deleteVids, v.Id) - deleteVolume = true + shouldDeleteVolume = true } else { glog.V(0).Infof("volume %d is expired", v.Id) } if v.lastIoError != nil { deleteVids = append(deleteVids, v.Id) - deleteVolume = true + shouldDeleteVolume = true glog.Warningf("volume %d has IO error: %v", v.Id, v.lastIoError) } } @@ -260,12 +261,12 @@ func (s *Store) CollectHeartbeat() *master_pb.Heartbeat { if _, exist := collectionVolumeSize[v.Collection]; !exist { collectionVolumeSize[v.Collection] = 0 } - if !deleteVolume { + if !shouldDeleteVolume { collectionVolumeSize[v.Collection] += volumeMessage.Size } else { collectionVolumeSize[v.Collection] -= volumeMessage.Size - if collectionVolumeSize[v.Collection] <= 0 { - delete(collectionVolumeSize, v.Collection) + if collectionVolumeSize[v.Collection] < 0 { + collectionVolumeSize[v.Collection] = 0 } } @@ -277,7 +278,7 @@ func (s *Store) CollectHeartbeat() *master_pb.Heartbeat { "isDiskSpaceLow": 0, } } - if !deleteVolume && v.IsReadOnly() { + if !shouldDeleteVolume && v.IsReadOnly() { collectionVolumeReadOnlyCount[v.Collection]["IsReadOnly"] += 1 if v.noWriteOrDelete { collectionVolumeReadOnlyCount[v.Collection]["noWriteOrDelete"] += 1 |