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: add 'memory decommit' command (#2058)

Browse source 
This command forces the memory manager to decommit memory pages back to the OS.
In addition, fixed some positional bugs in "memory malloc-stats"

Signed-off-by: Roman Gershman <roman@dragonflydb.io>
This commit is contained in:
Roman Gershman 2023-10-23 16:49:00 +03:00 • committed by GitHub
parent dd2cb1def1
commit 3095d8a168
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/server/memory_cmd.cc
View file

@ -63,7 +63,7 @@ std::string MallocStats(bool backing, unsigned tid) {
uint64_t delta = (absl::GetCurrentTimeNanos() - start) / 1000; uint64_t delta = (absl::GetCurrentTimeNanos() - start) / 1000;
absl::StrAppend(&str, "--- End mimalloc statistics, took ", delta, "us ---\n"); absl::StrAppend(&str, "--- End mimalloc statistics, took ", delta, "us ---\n");
absl::StrAppend(&str, "total reserved: ", reserved, ", comitted: ", committed, ", used: ", used, absl::StrAppend(&str, "total reserved: ", reserved, ", comitted: ", committed, ", used: ", used,
"fragmentation waste: ", " fragmentation waste: ",
(100.0 * (committed - used)) / std::max<size_t>(1UL, committed), "%\n"); (100.0 * (committed - used)) / std::max<size_t>(1UL, committed), "%\n");
return str; return str;
@ -88,6 +88,9 @@ void MemoryCmd::Run(CmdArgList args) {
" Show malloc stats for a heap residing in specified thread-id. 0 by default.", " Show malloc stats for a heap residing in specified thread-id. 0 by default.",
" If BACKING is specified, show stats for the backing heap.", " If BACKING is specified, show stats for the backing heap.",
"USAGE <key>", "USAGE <key>",
" Show memory usage of a key.",
"DECOMMIT",
" Force decommit the memory freed by the server back to OS.",
}; };
return (*cntx_)->SendSimpleStrArr(help_arr); return (*cntx_)->SendSimpleStrArr(help_arr);
}; };
@ -97,13 +100,21 @@ void MemoryCmd::Run(CmdArgList args) {
return Usage(key); return Usage(key);
} }
if (sub_cmd == "DECOMMIT") {
shard_set->pool()->Await([](auto* pb) {
mi_heap_collect(ServerState::tlocal()->data_heap(), true);
mi_heap_collect(mi_heap_get_backing(), true);
});
return (*cntx_)->SendSimpleString("OK");
}
if (sub_cmd == "MALLOC-STATS") { if (sub_cmd == "MALLOC-STATS") {
uint32_t tid = 0; uint32_t tid = 0;
bool backing = false; bool backing = false;
if (args.size() >= 3) { if (args.size() >= 2) {
ToUpper(&args[2]); ToUpper(&args[1]);
unsigned tid_indx = 2; unsigned tid_indx = 1;
if (ArgS(args, tid_indx) == "BACKING") { if (ArgS(args, tid_indx) == "BACKING") {
++tid_indx; ++tid_indx;
backing = true; backing = true;
@ -114,7 +125,15 @@ void MemoryCmd::Run(CmdArgList args) {
} }
} }
tid = tid % shard_set->pool()->size(); if (backing && tid >= shard_set->pool()->size()) {
return cntx_->SendError(
absl::StrCat("Thread id must be less than ", shard_set->pool()->size()));
}
if (!backing && tid >= shard_set->size()) {
return cntx_->SendError(absl::StrCat("Thread id must be less than ", shard_set->size()));
}
string res = shard_set->pool()->at(tid)->AwaitBrief([=] { return MallocStats(backing, tid); }); string res = shard_set->pool()->at(tid)->AwaitBrief([=] { return MallocStats(backing, tid); });
return (*cntx_)->SendBulkString(res); return (*cntx_)->SendBulkString(res);