Asynchronous upstream caching to Jupiter

Co-authored-by: Stefan Boberg <[email protected]>

1 files changed, 7 insertions, 5 deletions

diff --git a/zenserver/cache/kvcache.cpp b/zenserver/cache/kvcache.cpp
index 096edcef7..fbbb932ea 100644
--- a/zenserver/cache/kvcache.cpp
+++ b/zenserver/cache/kvcache.cpp
@@ -69,6 +69,7 @@ HttpKvCacheService::HttpKvCacheService()
 {
 	m_Cloud = new CloudCacheClient("https://jupiter.devtools.epicgames.com"sv,
 								   "ue4.ddc"sv /* namespace */,
+								   "test.ddc"sv /* blob store namespace */,
 								   "https://epicgames.okta.com/oauth2/auso645ojjWVdRI3d0x7/v1/token"sv /* provider */,
 								   "0oao91lrhqPiAlaGD0x7"sv /* client id */,
 								   "-GBWjjenhCgOwhxL5yBKNJECVIoDPH0MK4RDuN7d"sv /* oauth secret */);
@@ -115,16 +116,16 @@ HttpKvCacheService::HandleRequest(zen::HttpServerRequest& Request)
 
 						zen::Stopwatch Timer;
 
-						if (IoBuffer CloudValue = Session.Get("default", Key))
+						if (CloudCacheResult Result = Session.GetDerivedData("default", Key); Result.Success)
 						{
 							Success = true;
 
 							spdlog::debug("upstream HIT after {:5} {:6}! {}",
 										  zen::NiceTimeSpanMs(Timer.getElapsedTimeMs()),
-										  NiceBytes(CloudValue.Size()),
+										  NiceBytes(Result.Value.Size()),
 										  Key);
 
-							Value.Value = CloudValue;
+							Value.Value = Result.Value;
 						}
 						else
 						{
@@ -175,9 +176,10 @@ HttpKvCacheService::HandleRequest(zen::HttpServerRequest& Request)
 
 					zen::Stopwatch Timer;
 
-					Session.Put("default", Key, Value.Value);
+					CloudCacheResult Result = Session.PutDerivedData("default", Key, Value.Value);
 
-					spdlog::debug("upstream PUT took {:5} {:6}! {}",
+					spdlog::debug("upstream PUT '{}', took {:5} {:6}! {}",
+								  Result.Success ? "OK" : "FAILED",
 								  zen::NiceTimeSpanMs(Timer.getElapsedTimeMs()),
 								  NiceBytes(Value.Value.Size()),
 								  Key);