Merge branch 'release-7.1' into 7.1-fix-specialkeyspace

xis19 · web-flow · commit cb90dd3acd54 · 2023-03-14T12:15:08.000-07:00
diff --git a/documentation/sphinx/source/release-notes/release-notes-710.rst b/documentation/sphinx/source/release-notes/release-notes-710.rst
@@ -4,6 +4,20 @@
 Release Notes
 #############
 
+7.1.29
+======
+* Same as 7.1.28 release with AVX enabled.
+
+7.1.28
+======
+* Released with AVX disabled.
+* Changed log router to detect slow peeks and to automatically switch DC for peeking. `(PR #9640) <https://github.com/apple/foundationdb/pull/9640>`_
+* Added multiple prefix filter support for fdbdecode. `(PR #9483) <https://github.com/apple/foundationdb/pull/9483>`_, `(PR #9489) <https://github.com/apple/foundationdb/pull/9489>`_, `(PR #9511) <https://github.com/apple/foundationdb/pull/9511>`_, and `(PR #9560) <https://github.com/apple/foundationdb/pull/9560>`_
+* Enhanced fdbbackup query command to estimate data processing from a specific snapshot to a target version. `(PR #9506) <https://github.com/apple/foundationdb/pull/9506>`_
+* Improved PTree insertion and erase performance for storage servers. `(PR #9508) <https://github.com/apple/foundationdb/pull/9508>`_
+* Added exclude to fdbcli's configure command to prevent faulty TLogs from affecting recovery. `(PR #9404) <https://github.com/apple/foundationdb/pull/9404>`_
+* Fixed getMappedRange metrics. `(PR #9331) <https://github.com/apple/foundationdb/pull/9331>`_
+
 7.1.27
 ======
 * Same as 7.1.26 release with AVX enabled.
diff --git a/fdbclient/VersionedMap.h b/fdbclient/VersionedMap.h
@@ -724,7 +724,7 @@ class VersionedMap : NonCopyable {
 	}
 
 	Future<Void> forgetVersionsBeforeAsync(Version newOldestVersion, TaskPriority taskID = TaskPriority::DefaultYield) {
-		ASSERT(newOldestVersion <= latestVersion);
+		ASSERT_LE(newOldestVersion, latestVersion);
 		auto r = upper_bound(roots.begin(), roots.end(), newOldestVersion, rootsComparator());
 		auto upper = r;
 		--r;
diff --git a/fdbserver/ClusterRecovery.actor.cpp b/fdbserver/ClusterRecovery.actor.cpp
@@ -1093,10 +1093,14 @@ ACTOR Future<Void> readTransactionSystemState(Reference<ClusterRecoveryData> sel
 
 		if (self->recoveryTransactionVersion < minRequiredCommitVersion)
 			self->recoveryTransactionVersion = minRequiredCommitVersion;
-	}
 
-	if (BUGGIFY) {
-		self->recoveryTransactionVersion += deterministicRandom()->randomInt64(0, 10000000);
+		// Test randomly increasing the recovery version by a large number.
+		// When the version epoch is enabled, versions stay in sync with time.
+		// An offline cluster could see a large version jump when it comes back
+		// online, so test this behavior in simulation.
+		if (BUGGIFY) {
+			self->recoveryTransactionVersion += deterministicRandom()->randomInt64(0, 10000000);
+		}
 	}
 
 	TraceEvent(getRecoveryEventName(ClusterRecoveryEventType::CLUSTER_RECOVERY_RECOVERING_EVENT_NAME).c_str(),
diff --git a/tests/rare/ClogTlog.toml b/tests/rare/ClogTlog.toml
@@ -17,9 +17,9 @@ testTitle = 'ClogTlog'
     testName = 'Cycle'
     nodeCount = 30000
     transactionsPerSecond = 2500.0
-    testDuration = 120.0
+    testDuration = 60.0
     expectedRate = 0
 
     [[test.workload]]
     testName = 'ClogTlog'
-    testDuration = 3000.0
+    testDuration = 150.0

Original file line number	Diff line number	Diff line change
`@@ -724,7 +724,7 @@ class VersionedMap : NonCopyable {`
`724`	`724`	`}`
`725`	`725`
`726`	`726`	`Future<Void> forgetVersionsBeforeAsync(Version newOldestVersion, TaskPriority taskID = TaskPriority::DefaultYield) {`
`727`		`- ASSERT(newOldestVersion <= latestVersion);`
	`727`	`+ ASSERT_LE(newOldestVersion, latestVersion);`
`728`	`728`	`auto r = upper_bound(roots.begin(), roots.end(), newOldestVersion, rootsComparator());`
`729`	`729`	`auto upper = r;`
`730`	`730`	`--r;`