Merge pull request #8460 from sfc-gh-yiwu/encrypt_encoding

Fix Redwood xor encoding incompatibility with 7.1

fdbserver/include/fdbserver/IPageEncryptionKeyProvider.actor.h

@@ -39,6 +39,7 @@
 #include "flow/xxhash.h"
 
 #include <functional>
+#include <limits>
 #include <tuple>
 
 #include "flow/actorcompiler.h" // This must be the last #include.
@@ -154,12 +155,14 @@ public:
 		const EncodingHeader* h = reinterpret_cast<const EncodingHeader*>(encodingHeader);
 		EncryptionKey s;
 		s.xorKey = h->xorKey;
+		s.xorWith = xorWith;
 		return s;
 	}
 
 	Future<EncryptionKey> getLatestDefaultEncryptionKey() override {
 		EncryptionKey s;
-		s.xorKey = xorWith;
+		s.xorKey = static_cast<uint8_t>(deterministicRandom()->randomInt(0, std::numeric_limits<uint8_t>::max() + 1));
+		s.xorWith = xorWith;
 		return s;
 	}
 

fdbserver/include/fdbserver/IPager.h

@@ -228,6 +228,7 @@ public:
 	struct EncryptionKeyRef {
 		TextAndHeaderCipherKeys aesKey; // For AESEncryptionV1
 		uint8_t xorKey; // For XOREncryption_TestOnly
+		uint8_t xorWith; // For XOREncryption_TestOnly
 	};
 	using EncryptionKey = Standalone<EncryptionKeyRef>;
 
@@ -345,8 +346,9 @@ public:
 			Header* h = reinterpret_cast<Header*>(header);
 			h->checksum = XXH3_64bits_withSeed(payload, len, seed);
 			h->xorKey = encryptionKey.xorKey;
+			uint8_t xorMask = ~encryptionKey.xorKey ^ encryptionKey.xorWith;
 			for (int i = 0; i < len; ++i) {
-				payload[i] ^= h->xorKey;
+				payload[i] ^= xorMask;
 			}
 		}
 
@@ -356,8 +358,9 @@ public:
 		                   int len,
 		                   PhysicalPageID seed) {
 			Header* h = reinterpret_cast<Header*>(header);
+			uint8_t xorMask = ~encryptionKey.xorKey ^ encryptionKey.xorWith;
 			for (int i = 0; i < len; ++i) {
-				payload[i] ^= h->xorKey;
+				payload[i] ^= xorMask;
 			}
 			if (h->checksum != XXH3_64bits_withSeed(payload, len, seed)) {
 				throw page_decoding_failed();

tests/restarting/from_7.1.0/ConfigureStorageMigrationTestRestart-1.toml

@@ -1,6 +1,5 @@
 [configuration]
 extraMachineCountDC = 2
-storageEngineExcludeTypes = [3]
 
 [[test]]
 testTitle = 'CloggedConfigureDatabaseTest'

tests/restarting/from_7.1.0/ConfigureTestRestart-1.toml

@@ -1,6 +1,3 @@
-[configuration]
-storageEngineExcludeTypes = [3]
-
 [[test]]
 testTitle='CloggedConfigureDatabaseTest'
 clearAfterTest=false

tests/restarting/from_7.1.0/SnapCycleRestart-1.txt

@@ -1,4 +1,4 @@
-storageEngineExcludeTypes=3,4,5
+storageEngineExcludeTypes=4,5
 
 ;Take snap and do cycle test
 testTitle=SnapCyclePre

tests/restarting/from_7.1.0/SnapIncrementalRestore-1.txt

@@ -1,4 +1,4 @@
-storageEngineExcludeTypes=3,4,5
+storageEngineExcludeTypes=4,5
 
 logAntiQuorum = 0
 

tests/restarting/from_7.1.0/SnapTestAttrition-1.txt

@@ -1,4 +1,4 @@
-storageEngineExcludeTypes=3,4,5
+storageEngineExcludeTypes=4,5
 
 ;write 1000 Keys ending with even numbers
 testTitle=SnapTestPre

tests/restarting/from_7.1.0/SnapTestRestart-1.txt

@@ -1,4 +1,4 @@
-storageEngineExcludeTypes=3,4,5
+storageEngineExcludeTypes=4,5
 
 ;write 1000 Keys ending with even numbers
 testTitle=SnapTestPre

tests/restarting/from_7.1.0/SnapTestSimpleRestart-1.txt

@@ -1,4 +1,4 @@
-storageEngineExcludeTypes=3,4,5
+storageEngineExcludeTypes=4,5
 
 ;write 1000 Keys ending with even number
 testTitle=SnapSimplePre

tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml

@@ -1,6 +1,3 @@
-[configuration]
-storageEngineExcludeTypes = [3]
-
 [[knobs]]
 enable_version_vector = true
 enable_version_vector_tlog_unicast = true

tests/restarting/from_7.1.0/VersionVectorEnableRestart-1.toml

@@ -1,6 +1,3 @@
-[configuration]
-storageEngineExcludeTypes = [3]
-
 [[knobs]]
 enable_version_vector = false
 enable_version_vector_tlog_unicast = false

tests/restarting/from_7.2.0/DrUpgradeRestart-1.txt

@@ -1,4 +1,3 @@
-storageEngineExcludeTypes=3
 extraDatabaseMode=Local
 
 testTitle=DrUpgrade

tests/restarting/to_7.1.0/ConfigureStorageMigrationTestRestart-1.toml

@@ -3,7 +3,7 @@ extraMachineCountDC = 2
 maxTLogVersion=6
 disableHostname=true
 disableEncryption=true
-storageEngineExcludeTypes=[3,4]
+storageEngineExcludeTypes=[4]
 
 [[knobs]]
 # This can be removed once the lower bound of this downgrade test is a version that understands the new protocol