Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: bucket caching issue for multiple keys on audit log. #2305

Merged
merged 3 commits into from
Oct 10, 2024
Merged

fix: bucket caching issue for multiple keys on audit log. #2305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a50347
fixed bucket caching issue for multiple keys on audit log.
MichaelUnkey Oct 10, 2024
a97a6cb
[autofix.ci] apply automated fixes
autofix-ci[bot] Oct 10, 2024
8499ac9
Merge branch 'main' into fix-audit-log-for-multiple-requests
MichaelUnkey Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 30 additions & 10 deletions apps/workflows/jobs/refill-daily.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ client.defineJob({
const db = connectDatabase();
const t = new Date();
t.setUTCHours(t.getUTCHours() - 24);
const BUCKET_NAME = "unkey_mutations";
MichaelUnkey marked this conversation as resolved.
Show resolved Hide resolved

type Key = `${string}::${string}`;
type BucketId = string;
const bucketCache = new Map<Key, BucketId>();
const keys = await io.runTask("list keys", () =>
db.query.keys.findMany({
where: (table, { isNotNull, isNull, eq, and, gt, or }) =>
Expand All @@ -35,17 +39,33 @@ client.defineJob({
io.logger.info(`found ${keys.length} keys with daily refill set`);

for (const key of keys) {
const bucket = await io.runTask(`get bucket for ${key.workspaceId}`, async () => {
return await db.query.auditLogBucket.findFirst({
const cacheKey: Key = `${key.workspaceId}::${BUCKET_NAME}`;
let bucketId = "";
const cachedBucketId = bucketCache.get(cacheKey);
if (cachedBucketId) {
bucketId = cachedBucketId;
} else {
const bucket = await db.query.auditLogBucket.findFirst({
where: (table, { eq, and }) =>
and(eq(table.workspaceId, key.workspaceId), eq(table.name, "unkey_mutations")),
and(eq(table.workspaceId, key.workspaceId), eq(table.name, BUCKET_NAME)),
columns: {
id: true,
},
});
});
if (!bucket) {
io.logger.error(`bucket for ${key.workspaceId} does not exist`);
continue;

if (bucket) {
bucketId = bucket.id;
} else {
bucketId = newId("auditLogBucket");
await db.insert(schema.auditLogBucket).values({
id: bucketId,
workspaceId: key.workspaceId,
name: BUCKET_NAME,
});
}
}

bucketCache.set(cacheKey, bucketId);
MichaelUnkey marked this conversation as resolved.
Show resolved Hide resolved
await io.runTask(`refill for ${key.id}`, async () => {
await db.transaction(async (tx) => {
await tx
Expand All @@ -60,7 +80,7 @@ client.defineJob({
await tx.insert(schema.auditLog).values({
id: auditLogId,
workspaceId: key.workspaceId,
bucketId: bucket.id,
bucketId: bucketId,
time: Date.now(),
event: "key.update",
actorId: "trigger",
Expand All @@ -72,15 +92,15 @@ client.defineJob({
type: "workspace",
id: key.workspaceId,
workspaceId: key.workspaceId,
bucketId: bucket.id,
bucketId: bucketId,
auditLogId,
displayName: `workspace ${key.workspaceId}`,
},
{
type: "key",
id: key.id,
workspaceId: key.workspaceId,
bucketId: bucket.id,
bucketId: bucketId,
auditLogId,
displayName: `key ${key.id}`,
},
Expand Down
40 changes: 30 additions & 10 deletions apps/workflows/jobs/refill-monthly.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ client.defineJob({
const db = connectDatabase();
const t = new Date();
t.setUTCMonth(t.getUTCMonth() - 1);
const BUCKET_NAME = "unkey_mutations";

type Key = `${string}::${string}`;
type BucketId = string;
const bucketCache = new Map<Key, BucketId>();
const keys = await io.runTask("list keys", () =>
db.query.keys.findMany({
where: (table, { isNotNull, isNull, eq, and, or }) =>
Expand All @@ -33,17 +37,33 @@ client.defineJob({
);
io.logger.info(`found ${keys.length} keys with monthly refill set`);
for (const key of keys) {
const bucket = await io.runTask(`get bucket for ${key.workspaceId}`, async () => {
return await db.query.auditLogBucket.findFirst({
const cacheKey: Key = `${key.workspaceId}::${BUCKET_NAME}`;
let bucketId = "";
const cachedBucketId = bucketCache.get(cacheKey);
if (cachedBucketId) {
bucketId = cachedBucketId;
} else {
const bucket = await db.query.auditLogBucket.findFirst({
where: (table, { eq, and }) =>
and(eq(table.workspaceId, key.workspaceId), eq(table.name, "unkey_mutations")),
and(eq(table.workspaceId, key.workspaceId), eq(table.name, BUCKET_NAME)),
columns: {
id: true,
},
});
});
if (!bucket) {
io.logger.error(`bucket for ${key.workspaceId} does not exist`);
continue;

if (bucket) {
bucketId = bucket.id;
} else {
bucketId = newId("auditLogBucket");
await db.insert(schema.auditLogBucket).values({
id: bucketId,
workspaceId: key.workspaceId,
name: BUCKET_NAME,
});
}
MichaelUnkey marked this conversation as resolved.
Show resolved Hide resolved
}

bucketCache.set(cacheKey, bucketId);
await io.runTask(`refill for ${key.id}`, async () => {
await db.transaction(async (tx) => {
await tx
Expand All @@ -58,7 +78,7 @@ client.defineJob({
await tx.insert(schema.auditLog).values({
id: auditLogId,
workspaceId: key.workspaceId,
bucketId: bucket.id,
bucketId: bucketId,
time: Date.now(),
event: "key.update",
actorId: "trigger",
Expand All @@ -70,15 +90,15 @@ client.defineJob({
type: "workspace",
id: key.workspaceId,
workspaceId: key.workspaceId,
bucketId: bucket.id,
bucketId: bucketId,
auditLogId,
displayName: `workspace ${key.workspaceId}`,
},
{
type: "key",
id: key.id,
workspaceId: key.workspaceId,
bucketId: bucket.id,
bucketId: bucketId,
auditLogId,
displayName: `key ${key.id}`,
},
Expand Down
Loading