Add data on actual disk used that is compared to maxstorage

Snapchat · Mar 20, 2024 · 41733d7 · 41733d7
1 parent f5e367d
commit 41733d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/modules/keydb_modstatsd/modmain.cpp b/src/modules/keydb_modstatsd/modmain.cpp
@@ -101,6 +101,7 @@ std::unordered_map<std::string, StatsRecord> g_mapInfoFields = {
     { "used_memory_rss", { StatsD_Type::STATSD_GAUGE_BYTES }},
     { "maxmemory", { StatsD_Type::STATSD_GAUGE_BYTES, false /* prefixOnly */}},
     { "maxstorage", { StatsD_Type::STATSD_GAUGE_BYTES, false /* prefixOnly */}},
+    { "storage_used", { StatsD_Type::STATSD_GAUGE_BYTES, false /* prefixOnly */}},
     { "used_memory_dataset_perc", { StatsD_Type::STATSD_GAUGE_FLOAT }},
     { "avg_lock_contention", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
     { "repl_backlog_size", { StatsD_Type::STATSD_GAUGE_BYTES }},

diff --git a/src/server.cpp b/src/server.cpp
@@ -5827,7 +5827,8 @@ sds genRedisInfoString(const char *section) {
             "lazyfreed_objects:%zu\r\n"
             "storage_provider:%s\r\n"
             "available_system_memory:%s\r\n"
-            "maxstorage:%llu\r\n",
+            "maxstorage:%llu\r\n"
+            "storage_used:%llu\r\n",
             zmalloc_used,
             hmem,
             g_pserver->cron_malloc_stats.process_rss,
@@ -5874,7 +5875,8 @@ sds genRedisInfoString(const char *section) {
             lazyfreeGetFreedObjectsCount(),
             g_pserver->m_pstorageFactory ? g_pserver->m_pstorageFactory->name() : "none",
             available_system_mem,
-            g_pserver->maxstorage
+            g_pserver->maxstorage,
+            g_pserver->m_pstorageFactory ? g_pserver->m_pstorageFactory->totalDiskspaceUsed() : 0
         );
         freeMemoryOverheadData(mh);
     }