Eric Allam
6df8069c0e
* WIP batch trigger v2 * Fix for the DateField being one month out… getUTCMonth() is zero indexed 🤦♂️ * Added a custom date range filter * Deal with closing the custom date range * Child runs filter * Fix for the clear button untoggling the child runs * WIP batchTriggerV2 * Finished removing rate limit from the webapp * Added an index TaskRun to make useRealtimeBatch performant * Renamed the period filter labels to be “Last X mins” * Denormalize background worker columns into TaskRun * Use the runTags column on TaskRun * Add TaskRun ("projectId", "id" DESC) index * Improved the v2 batch trigger endpoint to process items in parallel and also added a threshold, below which the processing of items is async * Added a runId filter, and WIP for batchId filter * WIP triggerAll * Add new batch methods for triggering multiple different tasks in a single batch * Disabled switch styling * Batch filtering, force child runs to show if filtering by batch/run * Added schedule ID filtering * Force child runs to show when filtering by scheduleId, for consistency * realtime: allow setting enabled: false on useApiClient * Batches page * Always complete batches, not only batchTriggerAndWait in deployed tasks * Add batch.retrieve and allow filtering by batch in runs.list * Renamed pending to “In progress” * Tidied up the table a bit * Deal with old batches: “Legacy batch” * Added the Batch to the run inspector * Fixed the migration that created the new idempotency key index on BatchTaskRun * Fixed the name of the idempotencyKeyExpiresAt option and now default idempotency key TTL is 30 days, not 24 hours * Timezone fix: wrong month in Usage page dropdown * The DateField now defaults to local time, but can be overriden to use utc with an option * Don’t allow the task icon to get squished * BatchFilters removed unused imports * In the batch filtering, use `id` instead of `batchId` in the URL * BatchFilters: we don’t need a child tasks hidden input field * Creates some common filter components/functions * Fix for batchVersion check when filtering by batch status * Add additional logging around telemetry and more attributes for trigger spans * Show clear button for specific id filters * Batch list: only allow environments that are part of this project * Unnecessary optional chain Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Add JSDocs --------- Co-authored-by: Matt Aitken <matt@mattaitken.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
43 lines
1.2 KiB
TypeScript
43 lines
1.2 KiB
TypeScript
import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
|
|
import { env } from "~/env.server";
|
|
import { MarQS } from "./marqs/index.server";
|
|
|
|
export type QueueSizeGuardResult = {
|
|
isWithinLimits: boolean;
|
|
maximumSize?: number;
|
|
queueSize?: number;
|
|
};
|
|
|
|
export async function guardQueueSizeLimitsForEnv(
|
|
environment: AuthenticatedEnvironment,
|
|
marqs?: MarQS,
|
|
itemsToAdd: number = 1
|
|
): Promise<QueueSizeGuardResult> {
|
|
const maximumSize = getMaximumSizeForEnvironment(environment);
|
|
|
|
if (typeof maximumSize === "undefined") {
|
|
return { isWithinLimits: true };
|
|
}
|
|
|
|
if (!marqs) {
|
|
return { isWithinLimits: true, maximumSize };
|
|
}
|
|
|
|
const queueSize = await marqs.lengthOfEnvQueue(environment);
|
|
const projectedSize = queueSize + itemsToAdd;
|
|
|
|
return {
|
|
isWithinLimits: projectedSize <= maximumSize,
|
|
maximumSize,
|
|
queueSize,
|
|
};
|
|
}
|
|
|
|
function getMaximumSizeForEnvironment(environment: AuthenticatedEnvironment): number | undefined {
|
|
if (environment.type === "DEVELOPMENT") {
|
|
return environment.organization.maximumDevQueueSize ?? env.MAXIMUM_DEV_QUEUE_SIZE;
|
|
} else {
|
|
return environment.organization.maximumDeployedQueueSize ?? env.MAXIMUM_DEPLOYED_QUEUE_SIZE;
|
|
}
|
|
}
|