mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-11 18:35:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

feat(getslotsinfo): Add memory usage per slot (#2355)

Browse source 
It's a good thing we waited with this feature until after the recent
refactors. Now it's trivial and safer!

Fixes #1478
This commit is contained in:
Shahar Mike 2024-01-01 09:15:05 +02:00 • committed by GitHub
parent 1fb0a486ac
commit 40f2a7190e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 95 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/server/db_slice.cc
View file

@ -46,11 +46,18 @@ static_assert(kPrimeSegmentSize == 32288);
// 24576
static_assert(kExpireSegmentSize == 23528);
void AccountObjectMemory(unsigned type, int64_t size, DbTableStats* stats) {
DCHECK_GE(static_cast<int64_t>(stats->obj_memory_usage) + size, 0)
<< "Can't decrease " << size << " from " << stats->obj_memory_usage;
stats->obj_memory_usage += size;
stats->AddTypeMemoryUsage(type, size);
void AccountObjectMemory(string_view key, unsigned type, int64_t size, DbTable* db) {
DCHECK_NE(db, nullptr);
DbTableStats& stats = db->stats;
DCHECK_GE(static_cast<int64_t>(stats.obj_memory_usage) + size, 0)
<< "Can't decrease " << size << " from " << stats.obj_memory_usage;
stats.obj_memory_usage += size;
stats.AddTypeMemoryUsage(type, size);
if (ClusterConfig::IsEnabled()) {
db->slots_stats[ClusterConfig::KeySlot(key)].memory_bytes += size;
}
}
void PerformDeletion(PrimeIterator del_it, ExpireIterator exp_it, EngineShard* shard,
@ -82,8 +89,14 @@ void PerformDeletion(PrimeIterator del_it, ExpireIterator exp_it, EngineShard* s
}
stats.inline_keys -= del_it->first.IsInline();
AccountObjectMemory(del_it->first.ObjType(), -del_it->first.MallocUsed(), &stats); // Key
AccountObjectMemory(del_it->second.ObjType(), -del_it->second.MallocUsed(), &stats); // Value
{
string tmp;
string_view key = del_it->first.GetSlice(&tmp);
AccountObjectMemory(key, del_it->first.ObjType(), -del_it->first.MallocUsed(), table); // Key
AccountObjectMemory(key, del_it->second.ObjType(), -del_it->second.MallocUsed(),
table); // Value
}
if (pv.ObjType() == OBJ_HASH && pv.Encoding() == kEncodingListPack) {
--stats.listpack_blob_cnt;
@ -610,7 +623,7 @@ DbSlice::AddOrFindResult DbSlice::AddOrFind(const Context& cntx, string_view key
}
db.stats.inline_keys += it->first.IsInline();
AccountObjectMemory(it->first.ObjType(), it->first.MallocUsed(), &db.stats); // Account for key
AccountObjectMemory(key, it->first.ObjType(), it->first.MallocUsed(), &db); // Account for key
DCHECK_EQ(it->second.MallocUsed(), 0UL); // Make sure accounting is no-op
it.SetVersion(NextVersion());
@ -1035,10 +1048,8 @@ void DbSlice::PreUpdate(DbIndex db_ind, PrimeIterator it) {
}
void DbSlice::PostUpdate(DbIndex db_ind, PrimeIterator it, std::string_view key, size_t orig_size) {
DbTableStats* stats = MutableStats(db_ind);
int64_t delta = static_cast<int64_t>(it->second.MallocUsed()) - static_cast<int64_t>(orig_size);
AccountObjectMemory(it->second.ObjType(), delta, stats);
AccountObjectMemory(key, it->second.ObjType(), delta, GetDBTable(db_ind));
auto& db = *db_arr_[db_ind];
auto& watched_keys = db.watched_keys;
@ -1495,9 +1506,8 @@ void DbSlice::PerformDeletion(PrimeIterator del_it, ExpireIterator exp_it, Engin
size_t value_heap_size = pv.MallocUsed();
stats.inline_keys -= del_it->first.IsInline();
int64_t delta = del_it->first.MallocUsed() + value_heap_size;
stats.obj_memory_usage -= delta;
stats.AddTypeMemoryUsage(pv.ObjType(), -delta);
AccountObjectMemory(key, del_it->first.ObjType(), -del_it->first.MallocUsed(), table); // Key
AccountObjectMemory(key, pv.ObjType(), -value_heap_size, table); // Value
if (pv.ObjType() == OBJ_HASH && pv.Encoding() == kEncodingListPack) {
--stats.listpack_blob_cnt;
} else if (pv.ObjType() == OBJ_ZSET && pv.Encoding() == OBJ_ENCODING_LISTPACK) {