remote project store stats (#44)

* add remote oplog store statistics
* block chunking when uploading oplog to zenserver (mirroring)
* make sure we can move temporary dechunked file into cas store

3 files changed, 25 insertions, 13 deletions

diff --git a/src/zenserver/upstream/jupiter.cpp b/src/zenserver/upstream/jupiter.cpp
index c77834657..3e477f053 100644
--- a/src/zenserver/upstream/jupiter.cpp
+++ b/src/zenserver/upstream/jupiter.cpp
@@ -35,20 +35,25 @@ namespace detail {
 	{
 		if (Response.Error)
 		{
-			return {.ElapsedSeconds = Response.ElapsedSeconds,
+			return {.SentBytes		= gsl::narrow<uint64_t>(Response.UploadedBytes),
+					.ReceivedBytes	= gsl::narrow<uint64_t>(Response.DownloadedBytes),
+					.ElapsedSeconds = Response.ElapsedSeconds,
 					.ErrorCode		= Response.Error.value().ErrorCode,
 					.Reason			= Response.ErrorMessage(ErrorPrefix),
 					.Success		= false};
 		}
 		if (!Response.IsSuccess())
 		{
-			return {.ElapsedSeconds = Response.ElapsedSeconds,
+			return {.SentBytes		= gsl::narrow<uint64_t>(Response.UploadedBytes),
+					.ReceivedBytes	= gsl::narrow<uint64_t>(Response.DownloadedBytes),
+					.ElapsedSeconds = Response.ElapsedSeconds,
 					.ErrorCode		= static_cast<int32_t>(Response.StatusCode),
 					.Reason			= Response.ErrorMessage(ErrorPrefix),
 					.Success		= false};
 		}
 		return {.Response		= Response.ResponsePayload,
-				.Bytes			= Response.DownloadedBytes,
+				.SentBytes		= gsl::narrow<uint64_t>(Response.UploadedBytes),
+				.ReceivedBytes	= gsl::narrow<uint64_t>(Response.DownloadedBytes),
 				.ElapsedSeconds = Response.ElapsedSeconds,
 				.ErrorCode		= 0,
 				.Success		= true};
diff --git a/src/zenserver/upstream/jupiter.h b/src/zenserver/upstream/jupiter.h
index cfe8f6186..00ba55bad 100644
--- a/src/zenserver/upstream/jupiter.h
+++ b/src/zenserver/upstream/jupiter.h
@@ -52,7 +52,8 @@ struct CloudCacheAccessToken
 struct CloudCacheResult
 {
 	IoBuffer	Response;
-	int64_t		Bytes{};
+	uint64_t	SentBytes{};
+	uint64_t	ReceivedBytes{};
 	double		ElapsedSeconds{};
 	int32_t		ErrorCode{};
 	std::string Reason;
diff --git a/src/zenserver/upstream/upstreamcache.cpp b/src/zenserver/upstream/upstreamcache.cpp
index 6d1d026cc..ab8fe8704 100644
--- a/src/zenserver/upstream/upstreamcache.cpp
+++ b/src/zenserver/upstream/upstreamcache.cpp
@@ -210,7 +210,8 @@ namespace detail {
 
 							CacheRecord.IterateAttachments([&](CbFieldView AttachmentHash) {
 								CloudCacheResult AttachmentResult = Session.GetCompressedBlob(BlobStoreNamespace, AttachmentHash.AsHash());
-								Result.Bytes += AttachmentResult.Bytes;
+								Result.ReceivedBytes += AttachmentResult.ReceivedBytes;
+								Result.SentBytes += AttachmentResult.SentBytes;
 								Result.ElapsedSeconds += AttachmentResult.ElapsedSeconds;
 								Result.ErrorCode = AttachmentResult.ErrorCode;
 
@@ -249,7 +250,8 @@ namespace detail {
 
 							CacheRecord.IterateAttachments([&](CbFieldView AttachmentHash) {
 								CloudCacheResult AttachmentResult = Session.GetCompressedBlob(BlobStoreNamespace, AttachmentHash.AsHash());
-								Result.Bytes += AttachmentResult.Bytes;
+								Result.ReceivedBytes += AttachmentResult.ReceivedBytes;
+								Result.SentBytes += AttachmentResult.SentBytes;
 								Result.ElapsedSeconds += AttachmentResult.ElapsedSeconds;
 								Result.ErrorCode = AttachmentResult.ErrorCode;
 
@@ -283,7 +285,9 @@ namespace detail {
 
 				if (Result.ErrorCode == 0)
 				{
-					return {.Status = {.Bytes = Result.Bytes, .ElapsedSeconds = Result.ElapsedSeconds, .Success = Result.Success},
+					return {.Status = {.Bytes		   = gsl::narrow<int64_t>(Result.ReceivedBytes),
+									   .ElapsedSeconds = Result.ElapsedSeconds,
+									   .Success		   = Result.Success},
 							.Value	= Result.Response,
 							.Source = &m_Info};
 				}
@@ -379,7 +383,9 @@ namespace detail {
 
 				if (Result.ErrorCode == 0)
 				{
-					return {.Status = {.Bytes = Result.Bytes, .ElapsedSeconds = Result.ElapsedSeconds, .Success = Result.Success},
+					return {.Status = {.Bytes		   = gsl::narrow<int64_t>(Result.ReceivedBytes),
+									   .ElapsedSeconds = Result.ElapsedSeconds,
+									   .Success		   = Result.Success},
 							.Value	= Result.Response,
 							.Source = &m_Info};
 				}
@@ -555,7 +561,7 @@ namespace detail {
 					m_Status.SetFromErrorCode(Result.ErrorCode, Result.Reason);
 
 					return {.Reason			= std::move(Result.Reason),
-							.Bytes			= Result.Bytes,
+							.Bytes			= gsl::narrow<int64_t>(Result.ReceivedBytes),
 							.ElapsedSeconds = Result.ElapsedSeconds,
 							.Success		= Result.Success};
 				}
@@ -629,7 +635,7 @@ namespace detail {
 		static void AppendResult(const CloudCacheResult& Result, GetUpstreamCacheResult& Out)
 		{
 			Out.Success &= Result.Success;
-			Out.Bytes += Result.Bytes;
+			Out.Bytes += gsl::narrow<int64_t>(Result.ReceivedBytes);
 			Out.ElapsedSeconds += Result.ElapsedSeconds;
 
 			if (Result.ErrorCode)
@@ -673,7 +679,7 @@ namespace detail {
 						return false;
 					}
 
-					TotalBytes += BlobResult.Bytes;
+					TotalBytes += gsl::narrow<int64_t>(BlobResult.ReceivedBytes);
 					TotalElapsedSeconds += BlobResult.ElapsedSeconds;
 				}
 
@@ -694,7 +700,7 @@ namespace detail {
 						.Success = false};
 			}
 
-			TotalBytes += RefResult.Bytes;
+			TotalBytes += gsl::narrow<int64_t>(RefResult.ReceivedBytes);
 			TotalElapsedSeconds += RefResult.ElapsedSeconds;
 
 			std::string Reason;
@@ -746,7 +752,7 @@ namespace detail {
 				}
 			}
 
-			TotalBytes += FinalizeResult.Bytes;
+			TotalBytes += gsl::narrow<int64_t>(FinalizeResult.ReceivedBytes);
 			TotalElapsedSeconds += FinalizeResult.ElapsedSeconds;
 
 			return {.Bytes = TotalBytes, .ElapsedSeconds = TotalElapsedSeconds, .Success = true};