diff options
| author | Dan Engelbrecht <[email protected]> | 2025-10-20 13:37:58 +0200 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2025-10-20 13:37:58 +0200 |
| commit | 6e587f57d8c5cc9d37346bfa49eda174e01a697e (patch) | |
| tree | 5aff25f3da3be737a8a25448c6cac4e055abd818 /src/zenserver | |
| parent | updated chunking strategy (#589) (diff) | |
| download | zen-6e587f57d8c5cc9d37346bfa49eda174e01a697e.tar.xz zen-6e587f57d8c5cc9d37346bfa49eda174e01a697e.zip | |
fix builds storage stats (#590)
* restructure builds storage stats to match web-ui expectations
Diffstat (limited to 'src/zenserver')
| -rw-r--r-- | src/zenserver/storage/buildstore/httpbuildstore.cpp | 40 |
1 files changed, 22 insertions, 18 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()); } |