add more test

apple · May 2, 2024 · ef6d45c · ef6d45c
1 parent d4b5d0d
commit ef6d45c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
@@ -2834,7 +2834,7 @@ ACTOR static Future<Optional<std::string>> BulkLoadingTaskCommitActor(ReadYourWr
 	if (existingBulkLoadUpdate(ryw, Standalone(KeyRangeRef("cancel/"_sr, "cancel0"_sr)))) {
 		TraceEvent(SevWarn, "BulkLoadTaskCommitError")
 		    .detail("Reason", "Exist bulk loading cancel in the same transaction");
-		throw bulkload_check_status_input_error();
+		throw bulkload_add_task_input_error();
 	}
 
 	state KeyRange taskRange =
@@ -2880,7 +2880,7 @@ ACTOR static Future<Optional<std::string>> BulkLoadingTaskCommitActor(ReadYourWr
 					ASSERT(existBulkLoadTask.isValid());
 					TraceEvent(SevWarnAlways, "BulkLoadTaskCommitError")
 					    .detail("Reason", "New range conflicts to existing ones");
-					throw bulkload_add_task_input_error();
+					throw bulkload_task_conflict();
 				}
 			}
 			readBeginKey = result.back().key;
@@ -2937,7 +2937,7 @@ ACTOR static Future<Optional<std::string>> BulkLoadingCancelCommitActor(ReadYour
 	if (existingBulkLoadUpdate(ryw, Standalone(KeyRangeRef("task/"_sr, "task0"_sr)))) {
 		TraceEvent(SevWarn, "BulkLoadTaskCommitError")
 		    .detail("Reason", "Exist bulk loading cancel in the same transaction");
-		throw bulkload_check_status_input_error();
+		throw bulkload_cancel_task_input_error();
 	}
 
 	// Get all cancelled range in the current transaction

diff --git a/fdbserver/workloads/BulkLoading.actor.cpp b/fdbserver/workloads/BulkLoading.actor.cpp
@@ -124,7 +124,7 @@ struct BulkLoading : TestWorkload {
 			ASSERT(false);
 		} catch (Error& e) {
 			TraceEvent("BulkLoadWorkloadAddTaskFailed").errorUnsuppressed(e);
-			ASSERT(e.code() == error_code_bulkload_add_task_input_error);
+			ASSERT(e.code() == error_code_bulkload_task_conflict);
 		}
 
 		tr.reset();
@@ -189,6 +189,15 @@ struct BulkLoading : TestWorkload {
 		tr.setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
 		tr.setOption(FDBTransactionOptions::READ_SYSTEM_KEYS);
 		self->addBulkLoadTask(&tr, Standalone(KeyRangeRef("11"_sr, "2"_sr)), "5");
+
+		try {
+			RangeResult res8 = wait(tr.getRange(range3, GetRangeLimits()));
+			ASSERT(false);
+		} catch (Error& e) {
+			TraceEvent("BulkLoadWorkloadReadRangeError").errorUnsuppressed(e);
+			ASSERT(e.code() == error_code_bulkload_check_status_input_error);
+		}
+
 		wait(tr.commit());
 		TraceEvent("BulkLoadWorkloadTransactionCommitted")
 		    .detail("AtVersion", tr.getReadVersion().get())
@@ -199,11 +208,11 @@ struct BulkLoading : TestWorkload {
 		tr.setOption(FDBTransactionOptions::SPECIAL_KEY_SPACE_ENABLE_WRITES);
 		tr.setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
 		tr.setOption(FDBTransactionOptions::READ_SYSTEM_KEYS);
-		RangeResult res8 = wait(tr.getRange(range3, GetRangeLimits()));
+		RangeResult res9 = wait(tr.getRange(range3, GetRangeLimits()));
 		TraceEvent("BulkLoadWorkloadReadRange")
 		    .detail("AtVersion", tr.getReadVersion().get())
 		    .detail("Range", range3)
-		    .detail("Res", self->parseReadRangeResult(res8));
+		    .detail("Res", self->parseReadRangeResult(res9));
 
 		return Void();
 	}

diff --git a/flow/include/flow/error_definitions.h b/flow/include/flow/error_definitions.h
@@ -110,6 +110,7 @@ ERROR( consistency_check_urgent_task_failed, 1085, "Consistency check urgent tas
 ERROR( bulkload_add_task_input_error, 1086, "Bulk loading add task input is error" )
 ERROR( bulkload_cancel_task_input_error, 1087, "Bulk loading cancel task input is error" )
 ERROR( bulkload_check_status_input_error, 1088, "Bulk loading check task status input is error" )
+ERROR( bulkload_task_conflict, 1089, "Input bulk loading task is conflicting with existing task" )
 
 ERROR( broken_promise, 1100, "Broken promise" )
 ERROR( operation_cancelled, 1101, "Asynchronous operation cancelled" )