v4: fix stuck batch issue when processing happens before transaction commits (#2163)

* v4: fix stuck batch issue when processing happens before transaction commits

* Fix flaky test

Author: ericallam

apps/webapp/app/runEngine/services/batchTrigger.server.ts

@@ -273,15 +273,18 @@ export class RunEngineBatchTriggerService extends WithRunEngine {
 
         switch (this._batchProcessingStrategy) {
           case "sequential": {
-            await this.#enqueueBatchTaskRun({
-              batchId: batch.id,
-              processingId: batchId,
-              range: { start: 0, count: PROCESSING_BATCH_SIZE },
-              attemptCount: 0,
-              strategy: this._batchProcessingStrategy,
-              parentRunId: body.parentRunId,
-              resumeParentOnCompletion: body.resumeParentOnCompletion,
-            });
+            await this.#enqueueBatchTaskRun(
+              {
+                batchId: batch.id,
+                processingId: batchId,
+                range: { start: 0, count: PROCESSING_BATCH_SIZE },
+                attemptCount: 0,
+                strategy: this._batchProcessingStrategy,
+                parentRunId: body.parentRunId,
+                resumeParentOnCompletion: body.resumeParentOnCompletion,
+              },
+              tx
+            );
 
             break;
           }

apps/webapp/test/fairDequeuingStrategy.test.ts

@@ -263,8 +263,8 @@ describe("FairDequeuingStrategy", () => {
 
       console.log("Second distribution took", distribute2Duration, "ms");
 
-      // Make sure the second call is more than 9 times faster than the first
-      expect(distribute2Duration).toBeLessThan(withTolerance(distribute1Duration / 9));
+      // Make sure the second call is more than 2 times faster than the first
+      expect(distribute2Duration).toBeLessThan(withTolerance(distribute1Duration / 2));
 
       const startDistribute3 = performance.now();