Remove unnecessary disabled org check

Author: ericallam

apps/webapp/app/v3/marqs/fairDequeuingStrategy.server.ts

@@ -36,7 +36,6 @@ export type FairDequeuingStrategyOptions = {
   defaultOrgConcurrency: number;
   defaultEnvConcurrency: number;
   parentQueueLimit: number;
-  checkForDisabledOrgs: boolean;
   tracer: Tracer;
   seed?: string;
   /**
@@ -88,7 +87,6 @@ const defaultBiases: FairDequeuingStrategyBiases = {
 export class FairDequeuingStrategy implements MarQSFairDequeueStrategy {
   private _cache: UnkeyCache<{
     concurrencyLimit: number;
-    disabledConcurrency: boolean;
   }>;
 
   private _rng: seedrandom.PRNG;
@@ -107,11 +105,6 @@ export class FairDequeuingStrategy implements MarQSFairDequeueStrategy {
         fresh: 60_000, // The time in milliseconds that a value is considered fresh. Cache hits within this time will return the cached value.
         stale: 180_000, // The time in milliseconds that a value is considered stale. Cache hits within this time will return the cached value and trigger a background refresh.
       }),
-      disabledConcurrency: new Namespace<boolean>(ctx, {
-        stores: [memory],
-        fresh: 30_000, // The time in milliseconds that a value is considered fresh. Cache hits within this time will return the cached value.
-        stale: 180_000, // The time in milliseconds that a value is considered stale. Cache hits within this time will return the cached value and trigger a background refresh.
-      }),
     });
 
     this._rng = seedrandom(options.seed);
@@ -512,16 +505,6 @@ export class FairDequeuingStrategy implements MarQSFairDequeueStrategy {
     return await startSpan(this.options.tracer, "getOrgConcurrency", async (span) => {
       span.setAttribute("org_id", orgId);
 
-      if (this.options.checkForDisabledOrgs) {
-        const isDisabled = await this.#getConcurrencyDisabled(orgId);
-
-        if (isDisabled) {
-          span.setAttribute("disabled", true);
-
-          return { current: 0, limit: 0 };
-        }
-      }
-
       const [currentValue, limitValue] = await Promise.all([
         this.#getOrgCurrentConcurrency(orgId),
         this.#getOrgConcurrencyLimit(orgId),
@@ -587,22 +570,6 @@ export class FairDequeuingStrategy implements MarQSFairDequeueStrategy {
     });
   }
 
-  async #getConcurrencyDisabled(orgId: string) {
-    return await startSpan(this.options.tracer, "getConcurrencyDisabled", async (span) => {
-      span.setAttribute("org_id", orgId);
-
-      const key = this.options.keys.disabledConcurrencyLimitKey(orgId);
-
-      const result = await this._cache.disabledConcurrency.swr(key, async () => {
-        const value = await this.options.redis.exists(key);
-
-        return Boolean(value);
-      });
-
-      return typeof result.val === "boolean" ? result.val : false;
-    });
-  }
-
   async #getOrgConcurrencyLimit(orgId: string) {
     return await startSpan(this.options.tracer, "getOrgConcurrencyLimit", async (span) => {
       span.setAttribute("org_id", orgId);

apps/webapp/app/v3/marqs/index.server.ts

@@ -1619,7 +1619,6 @@ function getMarQSClient() {
           keys: keysProducer,
           defaultEnvConcurrency: env.DEFAULT_ENV_EXECUTION_CONCURRENCY_LIMIT,
           defaultOrgConcurrency: env.DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT,
-          checkForDisabledOrgs: true,
           biases: {
             concurrencyLimitBias: env.MARQS_CONCURRENCY_LIMIT_BIAS,
             availableCapacityBias: env.MARQS_AVAILABLE_CAPACITY_BIAS,
@@ -1635,7 +1634,6 @@ function getMarQSClient() {
           keys: keysProducer,
           defaultEnvConcurrency: env.DEFAULT_ENV_EXECUTION_CONCURRENCY_LIMIT,
           defaultOrgConcurrency: env.DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT,
-          checkForDisabledOrgs: false,
           biases: {
             concurrencyLimitBias: 0.0,
             availableCapacityBias: 0.0,

apps/webapp/app/v3/marqs/v2.server.ts

@@ -81,7 +81,6 @@ function getMarQSClient() {
       keys: new MarQSV2KeyProducer(KEY_PREFIX),
       defaultEnvConcurrency: env.V2_MARQS_DEFAULT_ENV_CONCURRENCY,
       defaultOrgConcurrency: env.DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT,
-      checkForDisabledOrgs: true,
     }),
     envQueuePriorityStrategy: new NoopFairDequeuingStrategy(), // We don't use this in v2, since all queues go through the shared queue
     workers: 0,

apps/webapp/test/fairDequeuingStrategy.test.ts

@@ -23,7 +23,6 @@ describe("FairDequeuingStrategy", () => {
       defaultOrgConcurrency: 10,
       defaultEnvConcurrency: 5,
       parentQueueLimit: 100,
-      checkForDisabledOrgs: true,
       seed: "test-seed-1", // for deterministic shuffling
     });
 
@@ -53,7 +52,6 @@ describe("FairDequeuingStrategy", () => {
       defaultOrgConcurrency: 2,
       defaultEnvConcurrency: 5,
       parentQueueLimit: 100,
-      checkForDisabledOrgs: true,
       seed: "test-seed-2",
     });
 
@@ -89,7 +87,6 @@ describe("FairDequeuingStrategy", () => {
       defaultOrgConcurrency: 10,
       defaultEnvConcurrency: 2,
       parentQueueLimit: 100,
-      checkForDisabledOrgs: true,
       seed: "test-seed-3",
     });
 
@@ -114,40 +111,6 @@ describe("FairDequeuingStrategy", () => {
     expect(result).toHaveLength(0);
   });
 
-  redisTest("should handle disabled orgs", async ({ redis }) => {
-    const keyProducer = createKeyProducer("test");
-    const strategy = new FairDequeuingStrategy({
-      tracer,
-      redis,
-      keys: keyProducer,
-      defaultOrgConcurrency: 10,
-      defaultEnvConcurrency: 5,
-      parentQueueLimit: 100,
-      checkForDisabledOrgs: true,
-      seed: "test-seed-4",
-    });
-
-    await setupQueue({
-      redis,
-      keyProducer,
-      parentQueue: "parent-queue",
-      score: Date.now() - 1000,
-      queueId: "queue-1",
-      orgId: "org-1",
-      envId: "env-1",
-    });
-
-    await setupConcurrency({
-      redis,
-      keyProducer,
-      org: { id: "org-1", currentConcurrency: 0, isDisabled: true },
-      env: { id: "env-1", currentConcurrency: 0 },
-    });
-
-    const result = await strategy.distributeFairQueuesFromParentQueue("parent-queue", "consumer-1");
-    expect(result).toHaveLength(0);
-  });
-
   redisTest("should respect parentQueueLimit", async ({ redis }) => {
     const keyProducer = createKeyProducer("test");
     const strategy = new FairDequeuingStrategy({
@@ -157,7 +120,6 @@ describe("FairDequeuingStrategy", () => {
       defaultOrgConcurrency: 10,
       defaultEnvConcurrency: 5,
       parentQueueLimit: 2, // Only take 2 queues
-      checkForDisabledOrgs: true,
       seed: "test-seed-6",
     });
 
@@ -212,7 +174,6 @@ describe("FairDequeuingStrategy", () => {
       defaultOrgConcurrency: 10,
       defaultEnvConcurrency: 5,
       parentQueueLimit: 10,
-      checkForDisabledOrgs: true,
       seed: "test-seed-reuse-1",
       reuseSnapshotCount: 1,
     });
@@ -302,7 +263,6 @@ describe("FairDequeuingStrategy", () => {
       defaultOrgConcurrency: 10,
       defaultEnvConcurrency: 5,
       parentQueueLimit: 100,
-      checkForDisabledOrgs: true,
       seed: "test-seed-5",
     });
 
@@ -460,7 +420,6 @@ describe("FairDequeuingStrategy", () => {
         defaultOrgConcurrency: 10,
         defaultEnvConcurrency: 5,
         parentQueueLimit: 100,
-        checkForDisabledOrgs: true,
         seed: "fixed-seed",
       });
 
@@ -620,7 +579,6 @@ describe("FairDequeuingStrategy", () => {
             defaultOrgConcurrency: 10,
             defaultEnvConcurrency: 5,
             parentQueueLimit: 100,
-            checkForDisabledOrgs: true,
             seed: `test-seed-${i}`,
             biases: {
               concurrencyLimitBias: 0.8,
@@ -705,7 +663,6 @@ describe("FairDequeuingStrategy", () => {
         defaultOrgConcurrency: 10,
         defaultEnvConcurrency: 5,
         parentQueueLimit: 100,
-        checkForDisabledOrgs: true,
         seed: "fixed-seed",
         biases: {
           concurrencyLimitBias: 0,
@@ -791,7 +748,6 @@ describe("FairDequeuingStrategy", () => {
         defaultOrgConcurrency: 10,
         defaultEnvConcurrency: 5,
         parentQueueLimit: 100,
-        checkForDisabledOrgs: true,
         seed: "test-seed-max-orgs",
         maximumOrgCount: 2, // Only select top 2 orgs
       });