Report flash disk usage

Former-commit-id: 8e4a71ccd31e3c643a6f7b5154d8f2a65d2de76f
This commit is contained in:
John Sully 2020-06-07 16:40:03 -04:00
parent 848cd33d51
commit d1208196ee
4 changed files with 12 additions and 0 deletions

View File

@ -9,6 +9,7 @@ public:
virtual ~IStorageFactory() {} virtual ~IStorageFactory() {}
virtual class IStorage *create(int db, key_load_iterator itr) = 0; virtual class IStorage *create(int db, key_load_iterator itr) = 0;
virtual const char *name() const = 0; virtual const char *name() const = 0;
virtual size_t totalDiskspaceUsed() const = 0;
}; };
class IStorage class IStorage

View File

@ -376,6 +376,7 @@ DEP = $(REDIS_SERVER_OBJ:%.o=%.d) $(REDIS_CLI_OBJ:%.o=%.d) $(REDIS_BENCHMARK_OBJ
clean: clean:
rm -rf $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_RDB_NAME) $(REDIS_CHECK_AOF_NAME) *.o *.gcda *.gcno *.gcov redis.info lcov-html Makefile.dep dict-benchmark rm -rf $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_RDB_NAME) $(REDIS_CHECK_AOF_NAME) *.o *.gcda *.gcno *.gcov redis.info lcov-html Makefile.dep dict-benchmark
rm -rf storage/*.o rm -rf storage/*.o
rm -rf keydb-server
rm -f $(DEP) rm -f $(DEP)
.PHONY: clean .PHONY: clean

View File

@ -4682,6 +4682,15 @@ sds genRedisInfoString(const char *section) {
g_pserver->m_pstorageFactory ? g_pserver->m_pstorageFactory->name() : "none" g_pserver->m_pstorageFactory ? g_pserver->m_pstorageFactory->name() : "none"
); );
freeMemoryOverheadData(mh); freeMemoryOverheadData(mh);
if (g_pserver->m_pstorageFactory)
{
info = sdscatprintf(info,
"%s_memory:%zu\r\n",
g_pserver->m_pstorageFactory->name(),
g_pserver->m_pstorageFactory->totalDiskspaceUsed()
);
}
} }
/* Persistence */ /* Persistence */

View File

@ -6,6 +6,7 @@ class TestStorageFactory : public IStorageFactory
{ {
virtual class IStorage *create(int db, key_load_iterator itr) override; virtual class IStorage *create(int db, key_load_iterator itr) override;
virtual const char *name() const override; virtual const char *name() const override;
virtual size_t totalDiskspaceUsed() const override { return 0; }
}; };
class TestStorageProvider final : public IStorage class TestStorageProvider final : public IStorage