Skip to content
TypeScript

perf(server): PR cache invalidation no longer waits on other projects' reads (1,163 ms → 0.12 ms median) (#30293)

Andrei8dbf2621fa1b
diff --git a/apps/server/src/pullRequest/PullRequestReadCache.test.ts b/apps/server/src/pullRequest/PullRequestReadCache.test.ts
index b73774700fc..071f1d4978a 100644
--- a/apps/server/src/pullRequest/PullRequestReadCache.test.ts
+++ b/apps/server/src/pullRequest/PullRequestReadCache.test.ts
@@ -44,6 +44,9 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("PR filesystem ca
const invalidate = yield* cache
.invalidate("pr")
.pipe(Effect.forkChild({ startImmediately: true }));
+ // Another PR's invalidation does not wait on this read; this one's does.
+ yield* cache.invalidate("other-pr");
+ assert.isUndefined(invalidate.pollUnsafe());
yield* Deferred.succeed(release, undefined);
yield* Fiber.join(read);
yield* Fiber.join(invalidate);
diff --git a/apps/server/src/pullRequest/PullRequestReadCache.ts b/apps/server/src/pullRequest/PullRequestReadCache.ts
index f3ec665ca97..7f03beef3a2 100644
--- a/apps/server/src/pullRequest/PullRequestReadCache.ts
+++ b/apps/server/src/pullRequest/PullRequestReadCache.ts
@@ -26,6 +26,8 @@ import { detachStackFrame } from "../git/detachStackFrame.ts";
import { forkParked } from "../serverActivation.ts";
const CONCURRENT_READS = 512;
+/** Invalidation excludes only reads whose scopes share its stripe, not every PR read. */
+const SCOPE_STRIPES = 64;
// Entry filenames are the URI-encoded `<storeId>:<key>`; the scope revisions file has
// no store id. Effect before 4.1 wrote `<storeId><key>`, still pruned here.
const STORE_ID = "pr-v2";
@@ -87,6 +89,11 @@ export const make = Effect.gen(function* () {
const clock = yield* Clock.Clock;
let enabled = true;
const lock = yield* Semaphore.make(CONCURRENT_READS);
+ const stripes = yield* Effect.forEach(Array.from({ length: SCOPE_STRIPES }), () =>
+ Semaphore.make(CONCURRENT_READS),
+ );
+ const stripeOf = (scope: string) => (Hash.string(scope) >>> 0) % SCOPE_STRIPES;
+ const revisionWrites = yield* Semaphore.make(1);
const digest = (key: string) =>
digester.digest(Digest.sha256, new TextEncoder().encode(key)).pipe(Effect.map(Hex.encode));
const revisions = yield* Cache.makeWith(
@@ -162,6 +169,12 @@ export const make = Effect.gen(function* () {
PersistenceError: () => read,
SchemaError: () => read,
}),
+ // A read stores its result under the revisions it started with, so an invalidation of
+ // one of its scopes must wait for it; reads of other scopes run on.
+ (effect) =>
+ [...new Set(scopes.map(stripeOf))]
+ .toSorted((left, right) => left - right)
+ .reduceRight((inner, stripe) => stripes[stripe]!.withPermits(1)(inner), effect),
lock.withPermits(1),
);
}, detachStackFrame),
@@ -182,7 +195,8 @@ export const make = Effect.gen(function* () {
return Effect.logWarning("PR cache disabled after clearing failed");
}),
Effect.uninterruptible,
- lock.withPermits(CONCURRENT_READS),
+ revisionWrites.withPermits(1),
+ (effect, scope) => stripes[stripeOf(scope)]!.withPermits(CONCURRENT_READS)(effect),
detachStackFrame,
),
});