@balena/pinejs 16.2.0-build-joshbwlng-tasks-009b08b1f157611c22f2425c25f905d5a59aaabe-1 → 16.2.0-build-joshbwlng-tasks-7478568100de4cf0789edd97865827cae9041667-1

package/src/tasks/index.ts

@@ -5,7 +5,7 @@ import type * as Db from '../database-layer/db';
 import { BadRequestError } from '../sbvr-api/errors';
 import { addPureHook } from '../sbvr-api/hooks';
 import { PinejsClient } from '../sbvr-api/sbvr-utils';
-import * as sbvrUtils from '../sbvr-api/sbvr-utils';
+import type * as sbvrUtils from '../sbvr-api/sbvr-utils';
 import { ajv, apiRoot, channel } from './common';
 import type { TaskHandler } from './types';
 import { Worker } from './worker';
@@ -48,9 +48,8 @@ async function createTrigger(tx: Db.Tx): Promise<void> {
 	`);
 }
 
-// Create indexes
+// Partial index for polling
 async function createIndexes(tx: Db.Tx): Promise<void> {
-	// Partial index for polling
 	await tx.executeSql(`
 		CREATE INDEX IF NOT EXISTS idx_task_poll ON task USING btree (
 			"is executed by-handler",
@@ -59,56 +58,6 @@ async function createIndexes(tx: Db.Tx): Promise<void> {
 			"id" ASC
 		) WHERE status = 'queued';
 	`);
-
-	// Partial index used to adjust priority based on actor
-	await tx.executeSql(`
-		CREATE INDEX IF NOT EXISTS idx_task_queued ON task (
-			"id",
-			"is created by-actor"
-		) WHERE status = 'queued';
-	`);
-}
-
-// Check if a task should be given priority
-// This is used to balance the load across actors
-// by giving priority to actors with less tasks in the queue
-// when another actor is crossing a percentage threshold of queued tasks
-// This is to prevent a single actor from hogging the queue
-async function adjustPriority(
-	actor: number,
-	priority: number,
-): Promise<number> {
-	const result = await (sbvrUtils.db.executeSql(
-		`SELECT "is created by-actor", COUNT("id") AS task_count
-		FROM (
-			SELECT "id", "is created by-actor"
-			FROM task
-			WHERE "status" = 'queued'
-			ORDER BY "id" DESC
-			LIMIT 100
-		) AS recent_tasks
-		GROUP BY "is created by-actor"
-		ORDER BY task_count DESC;
-	`,
-	) as Promise<{
-		rowsAffected: number;
-		rows: Array<{
-			'is created by-actor': number;
-			task_count: string;
-		}>;
-	}>);
-
-	// Increase the priority of this task if another actor is filling up the queue
-	if (
-		result.rows.some(
-			(row) =>
-				parseInt(row.task_count, 10) >= 49 &&
-				row['is created by-actor'] !== actor,
-		)
-	) {
-		return priority + 1;
-	}
-	return priority;
 }
 
 let worker: Worker | null = null;
@@ -144,14 +93,9 @@ export async function setup(db: Db.Database, tx: Db.Tx): Promise<void> {
 			// Set defaults
 			request.values.status = 'queued';
 			request.values.attempt_count = 0;
-			request.values.priority ??= 1;
 			request.values.attempt_limit ??= 1;
-
-			// Possibly adjust priority based on actor
-			request.values.priority = await adjustPriority(
-				request.values.is_created_by__actor,
-				request.values.priority,
-			);
+			// TODO: Implement a balancer to better enqueue tasks based on actor usage
+			request.values.priority ??= 1;
 
 			// Set scheduled start time using cron expression if provided
 			if (