fix builds storage stats (#590)

* restructure builds storage stats to match web-ui expectations

3 files changed, 32 insertions, 23 deletions

diff --git a/src/zenserver/storage/buildstore/httpbuildstore.cpp b/src/zenserver/storage/buildstore/httpbuildstore.cpp
index bce993f17..e5ea23acc 100644
--- a/src/zenserver/storage/buildstore/httpbuildstore.cpp
+++ b/src/zenserver/storage/buildstore/httpbuildstore.cpp
@@ -499,16 +499,28 @@ void
 HttpBuildStoreService::HandleStatsRequest(HttpServerRequest& Request)
 {
 	ZEN_TRACE_CPU("HttpBuildStoreService::Stats");
+
+	BuildStore::StorageStats StorageStats = m_BuildStore.GetStorageStats();
+
 	CbObjectWriter Cbo;
 
 	EmitSnapshot("requests", m_HttpRequests, Cbo);
 
-	Cbo.BeginObject("builds");
+	Cbo.BeginObject("store");
 	{
+		Cbo.BeginObject("size");
+		{
+			Cbo << "disk" << StorageStats.BlobLogByteCount + StorageStats.MetadataLogByteCount;
+			Cbo << "memory" << 0u;
+		}
+		Cbo.EndObject();
+
 		Cbo.BeginObject("blobs");
 		{
 			Cbo << "readcount" << m_BuildStoreStats.BlobReadCount << "writecount" << m_BuildStoreStats.BlobWriteCount << "hitcount"
 				<< m_BuildStoreStats.BlobHitCount;
+			Cbo << "count" << StorageStats.EntryCount;
+			Cbo << "bytes" << StorageStats.BlobBytes;
 		}
 		Cbo.EndObject();
 
@@ -516,6 +528,8 @@ HttpBuildStoreService::HandleStatsRequest(HttpServerRequest& Request)
 		{
 			Cbo << "readcount" << m_BuildStoreStats.BlobMetaReadCount << "writecount" << m_BuildStoreStats.BlobMetaWriteCount << "hitcount"
 				<< m_BuildStoreStats.BlobMetaHitCount;
+			Cbo << "count" << StorageStats.MetadataCount;
+			Cbo << "bytes" << StorageStats.MetadataByteCount;
 		}
 		Cbo.EndObject();
 
@@ -524,27 +538,17 @@ HttpBuildStoreService::HandleStatsRequest(HttpServerRequest& Request)
 	}
 	Cbo.EndObject();
 
-	Cbo.BeginObject("size");
+	Cbo.BeginObject("cid");
 	{
-		BuildStore::StorageStats StorageStats = m_BuildStore.GetStorageStats();
-
-		Cbo << "count" << StorageStats.EntryCount;
-		Cbo << "bytes" << StorageStats.BlobBytes + StorageStats.MetadataByteCount;
-		Cbo.BeginObject("blobs");
-		{
-			Cbo << "count" << StorageStats.BlobCount;
-			Cbo << "bytes" << StorageStats.BlobBytes;
-		}
-		Cbo.EndObject();  // blobs
-
-		Cbo.BeginObject("metadata");
+		Cbo.BeginObject("size");
 		{
-			Cbo << "count" << StorageStats.MetadataCount;
-			Cbo << "bytes" << StorageStats.MetadataByteCount;
+			Cbo << "blobs" << StorageStats.BlobBytes;
+			Cbo << "metadata" << StorageStats.MetadataByteCount;
+			Cbo << "total" << StorageStats.BlobBytes + StorageStats.MetadataByteCount;
 		}
-		Cbo.EndObject();  // metadata
+		Cbo.EndObject();
 	}
-	Cbo.EndObject();  // size
+	Cbo.EndObject();
 
 	return Request.WriteResponse(HttpResponseCode::OK, Cbo.Save());
 }
diff --git a/src/zenstore/buildstore/buildstore.cpp b/src/zenstore/buildstore/buildstore.cpp
index 5c6aa099c..aa28d8900 100644
--- a/src/zenstore/buildstore/buildstore.cpp
+++ b/src/zenstore/buildstore/buildstore.cpp
@@ -580,6 +580,9 @@ BuildStore::GetStorageStats() const
 				Result.MetadataByteCount += Metadata.GetSize();
 			}
 		}
+
+		Result.BlobLogByteCount		= m_PayloadlogFile.GetLogSize();
+		Result.MetadataLogByteCount = m_MetadatalogFile.GetLogSize();
 	}
 	return Result;
 }
diff --git a/src/zenstore/include/zenstore/buildstore/buildstore.h b/src/zenstore/include/zenstore/buildstore/buildstore.h
index 87b7dd812..76cba05b9 100644
--- a/src/zenstore/include/zenstore/buildstore/buildstore.h
+++ b/src/zenstore/include/zenstore/buildstore/buildstore.h
@@ -45,11 +45,13 @@ public:
 
 	struct StorageStats
 	{
-		uint64_t EntryCount		   = 0;
-		uint64_t BlobCount		   = 0;
-		uint64_t BlobBytes		   = 0;
-		uint64_t MetadataCount	   = 0;
-		uint64_t MetadataByteCount = 0;
+		uint64_t EntryCount			  = 0;
+		uint64_t BlobCount			  = 0;
+		uint64_t BlobBytes			  = 0;
+		uint64_t MetadataCount		  = 0;
+		uint64_t MetadataByteCount	  = 0;
+		uint64_t BlobLogByteCount	  = 0;
+		uint64_t MetadataLogByteCount = 0;
 	};
 
 	StorageStats GetStorageStats() const;