Add "Accept" field in RPC request to gracefully handle requests from older instances (#180)

1 files changed, 21 insertions, 9 deletions

diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index 61c1e2df1..82b770e3c 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -1340,7 +1340,7 @@ TEST_CASE("zcache.rpc")
 			((uint32_t*)(KeyHash.Hash))[0] = Key;
 			const zen::CacheKey CacheKey   = zen::CacheKey::Create(Bucket, KeyHash);
 
-			cacherequests::PutCacheRecordsRequest Request = {.Namespace = std::string(Namespace)};
+			cacherequests::PutCacheRecordsRequest Request = {.AcceptMagic = kCbPkgMagic, .Namespace = std::string(Namespace)};
 			AppendCacheRecord(Request, CacheKey, PayloadSize, CachePolicy::Default);
 			OutKeys.push_back(CacheKey);
 
@@ -1369,7 +1369,9 @@ TEST_CASE("zcache.rpc")
 							  std::string_view		   Namespace,
 							  std::span<zen::CacheKey> Keys,
 							  zen::CachePolicy		   Policy) -> GetCacheRecordResult {
-		cacherequests::GetCacheRecordsRequest Request = {.DefaultPolicy = Policy, .Namespace = std::string(Namespace)};
+		cacherequests::GetCacheRecordsRequest Request = {.AcceptMagic	= kCbPkgMagic,
+														 .DefaultPolicy = Policy,
+														 .Namespace		= std::string(Namespace)};
 		for (const CacheKey& Key : Keys)
 		{
 			Request.Requests.push_back({.Key = Key});
@@ -1592,7 +1594,7 @@ TEST_CASE("zcache.failing.upstream")
 												size_t			 PayloadSize = 8192) -> std::vector<CacheKey> {
 		std::vector<zen::CacheKey> OutKeys;
 
-		cacherequests::PutCacheRecordsRequest Request = {.Namespace = std::string(Namespace)};
+		cacherequests::PutCacheRecordsRequest Request = {.AcceptMagic = kCbPkgMagic, .Namespace = std::string(Namespace)};
 		for (size_t Key = 1; Key <= Num; ++Key)
 		{
 			zen::IoHash KeyHash;
@@ -1631,7 +1633,9 @@ TEST_CASE("zcache.failing.upstream")
 							  std::string_view		   Namespace,
 							  std::span<zen::CacheKey> Keys,
 							  zen::CachePolicy		   Policy) -> GetCacheRecordResult {
-		cacherequests::GetCacheRecordsRequest Request = {.DefaultPolicy = Policy, .Namespace = std::string(Namespace)};
+		cacherequests::GetCacheRecordsRequest Request = {.AcceptMagic	= kCbPkgMagic,
+														 .DefaultPolicy = Policy,
+														 .Namespace		= std::string(Namespace)};
 		for (const CacheKey& Key : Keys)
 		{
 			Request.Requests.push_back({.Key = Key});
@@ -2008,7 +2012,9 @@ TEST_CASE("zcache.rpc.allpolicies")
 	// PutCacheRecords
 	{
 		CachePolicy							  BatchDefaultPolicy = CachePolicy::Default;
-		cacherequests::PutCacheRecordsRequest Request = {.DefaultPolicy = BatchDefaultPolicy, .Namespace = std::string(TestNamespace)};
+		cacherequests::PutCacheRecordsRequest Request			 = {.AcceptMagic   = kCbPkgMagic,
+																	.DefaultPolicy = BatchDefaultPolicy,
+																	.Namespace	   = std::string(TestNamespace)};
 		Request.Requests.reserve(PutRequests.size());
 		for (CachePutRequest& PutRequest : PutRequests)
 		{
@@ -2036,7 +2042,9 @@ TEST_CASE("zcache.rpc.allpolicies")
 	{
 		CachePolicy BatchDefaultPolicy = CachePolicy::Default;
 
-		cacherequests::PutCacheValuesRequest Request = {.DefaultPolicy = BatchDefaultPolicy, .Namespace = std::string(TestNamespace)};
+		cacherequests::PutCacheValuesRequest Request = {.AcceptMagic   = kCbPkgMagic,
+														.DefaultPolicy = BatchDefaultPolicy,
+														.Namespace	   = std::string(TestNamespace)};
 		Request.Requests.reserve(PutValueRequests.size());
 		for (CachePutValueRequest& PutRequest : PutValueRequests)
 		{
@@ -2073,7 +2081,9 @@ TEST_CASE("zcache.rpc.allpolicies")
 	// GetCacheRecords
 	{
 		CachePolicy							  BatchDefaultPolicy = CachePolicy::Default;
-		cacherequests::GetCacheRecordsRequest Request = {.DefaultPolicy = BatchDefaultPolicy, .Namespace = std::string(TestNamespace)};
+		cacherequests::GetCacheRecordsRequest Request			 = {.AcceptMagic   = kCbPkgMagic,
+																	.DefaultPolicy = BatchDefaultPolicy,
+																	.Namespace	   = std::string(TestNamespace)};
 		Request.Requests.reserve(GetRequests.size());
 		for (CacheGetRequest& GetRequest : GetRequests)
 		{
@@ -2150,7 +2160,8 @@ TEST_CASE("zcache.rpc.allpolicies")
 	{
 		CachePolicy BatchDefaultPolicy = CachePolicy::Default;
 
-		cacherequests::GetCacheValuesRequest GetCacheValuesRequest = {.DefaultPolicy = BatchDefaultPolicy,
+		cacherequests::GetCacheValuesRequest GetCacheValuesRequest = {.AcceptMagic	 = kCbPkgMagic,
+																	  .DefaultPolicy = BatchDefaultPolicy,
 																	  .Namespace	 = std::string(TestNamespace)};
 		GetCacheValuesRequest.Requests.reserve(GetValueRequests.size());
 		for (CacheGetValueRequest& GetRequest : GetValueRequests)
@@ -2215,7 +2226,8 @@ TEST_CASE("zcache.rpc.allpolicies")
 			return A.Key.Hash < B.Key.Hash;
 		});
 		CachePolicy							 BatchDefaultPolicy	   = CachePolicy::Default;
-		cacherequests::GetCacheChunksRequest GetCacheChunksRequest = {.DefaultPolicy = BatchDefaultPolicy,
+		cacherequests::GetCacheChunksRequest GetCacheChunksRequest = {.AcceptMagic	 = kCbPkgMagic,
+																	  .DefaultPolicy = BatchDefaultPolicy,
 																	  .Namespace	 = std::string(TestNamespace)};
 		GetCacheChunksRequest.Requests.reserve(ChunkRequests.size());
 		for (CacheGetChunkRequest& ChunkRequest : ChunkRequests)