Add the check before calling verifyvaluerange

facebook · Feb 3, 2025 · 683020f · 683020f
1 parent 64d8c83
commit 683020f
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/db_stress_tool/no_batched_ops_stress.cc b/db_stress_tool/no_batched_ops_stress.cc
@@ -223,6 +223,14 @@ class NonBatchedOpsStressTest : public StressTest {
 
             s = secondary_db_->Get(options, secondary_cfhs_[cf], key, &from_db);
 
+            if (!s.ok() && IsErrorInjectedAndRetryable(s)) {
+              fprintf(
+                  stdout,
+                  "Skipping secondary verification for key because error was "
+                  "injected into read\n");
+              continue;
+            }
+
             assert(!pre_read_expected_values.empty() &&
                    static_cast<size_t>(i - start) <
                        pre_read_expected_values.size());
@@ -231,7 +239,6 @@ class NonBatchedOpsStressTest : public StressTest {
                              pre_read_expected_values[i - start]);
           }
         }
-
       } else if (method == VerificationMethod::kGetEntity) {
         for (int64_t i = start; i < end; ++i) {
           if (thread->shared->HasVerificationFailedYet()) {
@@ -2966,11 +2973,7 @@ class NonBatchedOpsStressTest : public StressTest {
                           Slice(expected_value_data, expected_value_data_size));
         return false;
       }
-    } else if (IsErrorInjectedAndRetryable(s) {
-      fprintf(stdout,
-              "Skipping secondary verification because error was "
-              "injected into read\n");
-      } else {
+    } else {
       VerificationAbort(
           shared,
           msg_prefix + ": Non-OK status" + read_u64ts.str() + s.ToString(), cf,