Parameterized queue length in GetMappedRange test

flowguru · flowguru · commit 0e74277e8ad0 · 2023-03-27T06:22:44.000-07:00
Also retry when operation_cancelled happens
diff --git a/fdbserver/workloads/GetMappedRange.actor.cpp b/fdbserver/workloads/GetMappedRange.actor.cpp
@@ -51,10 +51,12 @@ struct GetMappedRangeWorkload : ApiWorkload {
 	const bool SPLIT_RECORDS = true;
 	const static int SPLIT_SIZE = 3;
 	int checkStorageQueueSeconds;
+	int queueMaxLength;
 
 	GetMappedRangeWorkload(WorkloadContext const& wcx) : ApiWorkload(wcx) {
 		enabled = !clientId; // only do this on the "first" client
-		checkStorageQueueSeconds = getOption(options, "checkStorageQueueSeconds"_sr, 30.0);
+		checkStorageQueueSeconds = getOption(options, "checkStorageQueueSeconds"_sr, 60.0);
+		queueMaxLength = getOption(options, "queueMaxLength"_sr, 100);
 	}
 
 	std::string description() const override { return "GetMappedRange"; }
@@ -251,7 +253,8 @@ struct GetMappedRangeWorkload : ApiWorkload {
 				     e.code() == error_code_quick_get_key_values_miss)) {
 					TraceEvent("GetMappedRangeWorkloadExpectedErrorDetected").error(e);
 					return MappedRangeResult();
-				} else if (e.code() == error_code_proxy_memory_limit_exceeded) {
+				} else if (e.code() == error_code_proxy_memory_limit_exceeded ||
+				           e.code() == error_code_operation_cancelled) {
 					// requests have overwhelmed commit proxy, rest a bit
 					wait(delay(FLOW_KNOBS->PREVENT_FAST_SPIN_DELAY));
 					continue;
@@ -446,8 +449,8 @@ struct GetMappedRangeWorkload : ApiWorkload {
 						if (role["role"].get_str() == "storage") {
 							role.get("query_queue_max", queryQueueMax);
 							TEST(queryQueueMax > 0); // SS query queue is non-empty
-							ASSERT(queryQueueMax < 100); // if the queue size metric is wrong, it is likely above 100
 							TraceEvent(SevDebug, "QueryQueueMax").detail("Value", queryQueueMax);
+							ASSERT(queryQueueMax < self->queueMaxLength);
 						}
 					}
 				} else {
diff --git a/tests/fast/GetMappedRange.toml b/tests/fast/GetMappedRange.toml
@@ -4,4 +4,5 @@ useDB = true
 
     [[test.workload]]
     testName = 'GetMappedRange'
-    checkStorageQueueSeconds=60
+    checkStorageQueueSeconds=60
+    queueMaxLength=100
