Added CacheStore and CAS store sizes to status endpoint.

1 files changed, 18 insertions, 0 deletions

diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp
index 53e1b1c61..fe3f44e00 100644
--- a/zenserver/cache/structuredcache.cpp
+++ b/zenserver/cache/structuredcache.cpp
@@ -1192,7 +1192,16 @@ HttpStructuredCacheService::HandleStatsRequest(zen::HttpServerRequest& Request)
 	const uint64_t MissCount		= m_CacheStats.MissCount;
 	const uint64_t TotalCount		= HitCount + MissCount;
 
+	const CasStoreSize CasSize	 = m_CidStore.CasSize();
+	const ZenCacheSize CacheSize = m_CacheStore.TotalSize();
+
 	Cbo.BeginObject("cache");
+	Cbo.BeginObject("size");
+	Cbo << "disk" << CacheSize.DiskSize;
+	Cbo << "memory" << CacheSize.MemorySize;
+	Cbo.EndObject();
+	Cbo << "upstream_ratio" << (HitCount > 0 ? (double(UpstreamHitCount) / double(HitCount)) : 0.0);
+	Cbo << "cas_tiny_size" << CasSize.TinySize;
 	Cbo << "hits" << HitCount << "misses" << MissCount;
 	Cbo << "hit_ratio" << (TotalCount > 0 ? (double(HitCount) / double(TotalCount)) : 0.0);
 	Cbo << "upstream_hits" << m_CacheStats.UpstreamHitCount;
@@ -1206,6 +1215,15 @@ HttpStructuredCacheService::HandleStatsRequest(zen::HttpServerRequest& Request)
 		Cbo.EndObject();
 	}
 
+	Cbo.BeginObject("cas");
+	Cbo.BeginObject("size");
+	Cbo << "tiny" << CasSize.TinySize;
+	Cbo << "small" << CasSize.SmallSize;
+	Cbo << "large" << CasSize.LargeSize;
+	Cbo << "total" << CasSize.TotalSize;
+	Cbo.EndObject();
+	Cbo.EndObject();
+
 	Request.WriteResponse(HttpResponseCode::OK, Cbo.Save());
 }