Fix async tasks race condition for selecting task to be executed

Change-type: patch
balena-io · Oct 27, 2024 · 582c7cb · 582c7cb
1 parent 6e5e079
commit 582c7cb
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 33 deletions.
diff --git a/src/tasks/worker.ts b/src/tasks/worker.ts
@@ -220,7 +220,7 @@ export class Worker {
 					return;
 				}
 				await sbvrUtils.db.transaction(async (tx) => {
-					const result = await sbvrUtils.db.executeSql(
+					const result = await tx.executeSql(
 						`SELECT ${selectColumns}
 						FROM task AS t
 						WHERE

diff --git a/test/08-tasks.test.ts b/test/08-tasks.test.ts
@@ -475,39 +475,39 @@ describe('08 task tests', function () {
 				attempt_count: 1,
 			});
 		});
-	});
 
-	it('should only run task once with multiple pine instances', async () => {
-		const { body: device } = await pineTest
-			.post({
-				apiPrefix: 'example/',
-				resource: 'device',
-				body: {
-					name: randomUUID(),
-					type: randomUUID(),
-					count: 0,
-				},
-			})
-			.expect(201);
+		it('should only run task once with multiple pine instances', async () => {
+			const { body: device } = await pineTest
+				.post({
+					apiPrefix: 'example/',
+					resource: 'device',
+					body: {
+						name: randomUUID(),
+						type: randomUUID(),
+						count: 0,
+					},
+				})
+				.expect(201);
 
-		for (let j = 0; j < 30; j++) {
-			await createTask(pineTest, apikey, {
-				is_executed_by__handler: 'increment_device_count',
-				is_executed_with__parameter_set: {
-					deviceId: device.id,
-				},
-			});
+			for (let j = 0; j < 30; j++) {
+				await createTask(pineTest, apikey, {
+					is_executed_by__handler: 'increment_device_count',
+					is_executed_with__parameter_set: {
+						deviceId: device.id,
+					},
+				});
 
-			await waitFor(async () => {
-				const { body: deviceAfter } = await pineTest
-					.get({
-						apiPrefix: 'example/',
-						resource: 'device',
-						id: device.id,
-					})
-					.expect(200);
-				return deviceAfter?.count === j + 1;
-			});
-		}
+				await waitFor(async () => {
+					const { body: deviceAfter } = await pineTest
+						.get({
+							apiPrefix: 'example/',
+							resource: 'device',
+							id: device.id,
+						})
+						.expect(200);
+					return deviceAfter?.count === j + 1;
+				});
+			}
+		});
 	});
 });
diff --git a/test/lib/common.ts b/test/lib/common.ts
@@ -1,5 +1,4 @@
 import { expect } from 'chai';
-import net, { type AddressInfo } from 'node:net';
 
 export function assertExists(v: unknown): asserts v is NonNullable<typeof v> {
 	expect(v).to.exist;