apache
diff --git a/‎cloud/src/meta-service/meta_service_txn.cpp
Copy file name to clipboardExpand all lines: cloud/src/meta-service/meta_service_txn.cpp
+1-1Lines changed: 1 addition & 1 deletion b/‎cloud/src/meta-service/meta_service_txn.cpp
Copy file name to clipboardExpand all lines: cloud/src/meta-service/meta_service_txn.cpp
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎regression-test/suites/fault_injection_p0/cloud/test_cloud_pending_delete_bitmaps_removed_by_other_txn.groovy
Copy file name to clipboardExpand all lines: regression-test/suites/fault_injection_p0/cloud/test_cloud_pending_delete_bitmaps_removed_by_other_txn.groovy
+2-2Lines changed: 2 additions & 2 deletions b/‎regression-test/suites/fault_injection_p0/cloud/test_cloud_pending_delete_bitmaps_removed_by_other_txn.groovy
Copy file name to clipboardExpand all lines: regression-test/suites/fault_injection_p0/cloud/test_cloud_pending_delete_bitmaps_removed_by_other_txn.groovy
+2-2Lines changed: 2 additions & 2 deletions
@@ -996,7 +996,7 @@ void process_mow_when_commit_txn(
                 return;
             }
 
-            if (pending_info.lock_id() != lock_id) {
+            if (pending_info.has_lock_id() && pending_info.lock_id() != lock_id) {
                 code = MetaServiceCode::PENDING_DELETE_BITMAP_WRONG;
                 msg = fmt::format(
                         "wrong lock_id in pending delete bitmap infos, expect lock_id={}, but "
 
@@ -50,8 +50,8 @@ suite("test_cloud_pending_delete_bitmaps_removed_by_other_txn", "nonConcurrent")
             GetDebugPoint().clearDebugPointsForAllFEs()
             GetDebugPoint().clearDebugPointsForAllBEs()
 
-            // block the first load after it writes pending delete bitmaps in MS and before
-            // it commit txn in MS util its delete bitmap update lock in MS timeout
+            // let the first load fail and retry after it writes pending delete bitmaps in MS and before
+            // it commit txn in MS
             GetDebugPoint().enableDebugPointForAllBEs("CloudTablet::save_delete_bitmap.enable_sleep", [sleep: 5])
             GetDebugPoint().enableDebugPointForAllBEs("CloudTablet::save_delete_bitmap.injected_error", [retry: true])
Original file line number	Diff line number	Diff line change
`@@ -996,7 +996,7 @@ void process_mow_when_commit_txn(`
`996`	`996`	`return;`
`997`	`997`	`}`
`998`	`998`
`999`		`- if (pending_info.lock_id() != lock_id) {`
	`999`	`+ if (pending_info.has_lock_id() && pending_info.lock_id() != lock_id) {`
`1000`	`1000`	`code = MetaServiceCode::PENDING_DELETE_BITMAP_WRONG;`
`1001`	`1001`	`msg = fmt::format(`
`1002`	`1002`	`"wrong lock_id in pending delete bitmap infos, expect lock_id={}, but "`