fix(backend): prevent duplicate index jobs from indexedAt race#1298

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

Merged
brendan-kellam merged 2 commits into from
Jun 10, 2026
Merged

fix(backend): prevent duplicate index jobs from indexedAt race #1298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74ba58a
fix(backend): prevent duplicate index jobs from indexedAt race
brendan-kellam Jun 10, 2026
6b2b9ea
docs: add CHANGELOG entry for #1298
brendan-kellam Jun 10, 2026
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Surfaced an actionable error when the Lighthouse licensing service is unreachable, instead of a generic "unexpected error". [#1293](https://github.com/sourcebot-dev/sourcebot/pull/1293)
- Fixed the selected language model rapidly flipping in local storage after a language model was removed. [#1295](https://github.com/sourcebot-dev/sourcebot/pull/1295)
- Fixed issue where using multiple identity providers of the same type (e.g., gitlab) would result in unexpected behaviours. [#1177](https://github.com/sourcebot-dev/sourcebot/pull/1177)
- Fixed a race condition where large repositories could be indexed twice within a single reindex interval. [#1298](https://github.com/sourcebot-dev/sourcebot/pull/1298)

## [5.0.1] - 2026-06-04

Expand Down
39 changes: 17 additions & 22 deletions packages/backend/src/repoIndexManager.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -525,17 +525,16 @@ describe('RepoIndexManager', () => {

manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

// The onJobCompleted handler reads the job via findUniqueOrThrow, then marks it
// COMPLETED and updates the repo (indexedAt, etc.) in a single repoIndexingJob.update
// with a nested repo update.
(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
status: RepoIndexingJobStatus.PENDING,
});
// The onJobCompleted handler calls repoIndexingJob.update once and then repo.update
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
type: RepoIndexingJobType.INDEX,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repo.update as Mock).mockResolvedValue(repo);
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });

// Get the onCompleted handler
const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];
Expand All@@ -552,22 +551,20 @@ describe('RepoIndexManager', () => {

await onCompletedHandler(mockJob);

// The job status and indexedAt must be written together (single transaction) to
// close the race where the scheduler sees a completed job but a stale indexedAt.
expect(mockPrisma.repoIndexingJob.update).toHaveBeenCalledWith(
expect.objectContaining({
where: { id: 'job-1' },
data: expect.objectContaining({
status: RepoIndexingJobStatus.COMPLETED,
completedAt: expect.any(Date),
}),
})
);

expect(mockPrisma.repo.update).toHaveBeenCalledWith(
expect.objectContaining({
where: { id: repo.id },
data: expect.objectContaining({
indexedAt: expect.any(Date),
indexedCommitHash: 'abc123',
repo: {
update: expect.objectContaining({
indexedAt: expect.any(Date),
indexedCommitHash: 'abc123',
}),
},
}),
})
);
Expand DownExpand Up@@ -754,14 +751,12 @@ describe('RepoIndexManager', () => {
manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
status: RepoIndexingJobStatus.PENDING,
});
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
type: RepoIndexingJobType.CLEANUP,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });
(mockPrisma.repo.delete as Mock).mockResolvedValue(repo);

const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];
Expand DownExpand Up@@ -840,13 +835,13 @@ describe('RepoIndexManager', () => {

manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
type: RepoIndexingJobType.INDEX,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repo.update as Mock).mockResolvedValue(repo);
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });

const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];

Expand All@@ -867,9 +862,9 @@ describe('RepoIndexManager', () => {
data: expect.objectContaining({
status: RepoIndexingJobStatus.COMPLETED,
repo: {
update: {
update: expect.objectContaining({
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
},
}),
},
}),
})
Expand Down
65 changes: 38 additions & 27 deletions packages/backend/src/repoIndexManager.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -545,23 +545,16 @@ export class RepoIndexManager {
private async onJobCompleted(job: Job<JobPayload>) {
try {
const logger = createJobLogger(job.data.jobId);
const jobData = await this.db.repoIndexingJob.update({
const jobData = await this.db.repoIndexingJob.findUniqueOrThrow({
where: { id: job.data.jobId },
data: {
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
repo: {
update: {
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
}
}
},
include: {
repo: true,
}
});

const jobTypeLabel = getJobTypePrometheusLabel(jobData.type);
// @note: capture this before the update below, since the update sets indexedAt.
const isFirstIndex = jobData.repo.indexedAt === null;

if (jobData.type === RepoIndexingJobType.INDEX) {
const { path: repoPath } = getRepoPath(jobData.repo);
Expand All@@ -576,29 +569,47 @@ export class RepoIndexManager {

const jobMetadata = repoIndexingJobMetadataSchema.parse(jobData.metadata);

const repo = await this.db.repo.update({
where: { id: jobData.repoId },
const { repo } = await this.db.repoIndexingJob.update({
where: { id: job.data.jobId },
data: {
indexedAt: new Date(),
indexedCommitHash: commitHash,
pushedAt: pushedAt,
metadata: {
...(jobData.repo.metadata as RepoMetadata),
indexedRevisions: jobMetadata.indexedRevisions,
} satisfies RepoMetadata,
// @note: always update the default branch. While this field can be set
// during connection syncing, by setting it here we ensure that a) the
// default branch is as up to date as possible (since repo indexing happens
// more frequently than connection syncing) and b) for hosts where it is
// impossible to determine the default branch from the host's API
// (e.g., generic git url), we still set the default branch here.
defaultBranch: defaultBranch,
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
repo: {
update: {
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
indexedAt: new Date(),
indexedCommitHash: commitHash,
pushedAt: pushedAt,
metadata: {
...(jobData.repo.metadata as RepoMetadata),
indexedRevisions: jobMetadata.indexedRevisions,
} satisfies RepoMetadata,
// @note: always update the default branch. While this field can be set
// during connection syncing, by setting it here we ensure that a) the
// default branch is as up to date as possible (since repo indexing happens
// more frequently than connection syncing) and b) for hosts where it is
// impossible to determine the default branch from the host's API
// (e.g., generic git url), we still set the default branch here.
defaultBranch: defaultBranch,
}
}
},
include: {
repo: true,
}
});

logger.debug(`Completed index job ${job.data.jobId} for repo ${repo.name} (id: ${repo.id})`);
}
else if (jobData.type === RepoIndexingJobType.CLEANUP) {
await this.db.repoIndexingJob.update({
where: { id: job.data.jobId },
data: {
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
}
});

const repo = await this.db.repo.delete({
where: { id: jobData.repoId },
});
Expand All@@ -610,7 +621,7 @@ export class RepoIndexManager {
this.promClient.activeRepoIndexJobs.dec({ repo: job.data.repoName, type: jobTypeLabel });
this.promClient.repoIndexJobSuccessTotal.inc({ repo: job.data.repoName, type: jobTypeLabel });

if (jobData.type === RepoIndexingJobType.INDEX && jobData.repo.indexedAt === null) {
if (jobData.type === RepoIndexingJobType.INDEX && isFirstIndex) {
captureEvent('backend_repo_first_indexed', {
repoId: job.data.repoId,
type: jobData.repo.external_codeHostType,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

fix(backend): prevent duplicate index jobs from indexedAt race#1298

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

Merged
brendan-kellam merged 2 commits into from
Jun 10, 2026
Merged

fix(backend): prevent duplicate index jobs from indexedAt race #1298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74ba58a
fix(backend): prevent duplicate index jobs from indexedAt race
brendan-kellam Jun 10, 2026
6b2b9ea
docs: add CHANGELOG entry for #1298
brendan-kellam Jun 10, 2026
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Surfaced an actionable error when the Lighthouse licensing service is unreachable, instead of a generic "unexpected error". [#1293](https://github.com/sourcebot-dev/sourcebot/pull/1293)
- Fixed the selected language model rapidly flipping in local storage after a language model was removed. [#1295](https://github.com/sourcebot-dev/sourcebot/pull/1295)
- Fixed issue where using multiple identity providers of the same type (e.g., gitlab) would result in unexpected behaviours. [#1177](https://github.com/sourcebot-dev/sourcebot/pull/1177)
- Fixed a race condition where large repositories could be indexed twice within a single reindex interval. [#1298](https://github.com/sourcebot-dev/sourcebot/pull/1298)

## [5.0.1] - 2026-06-04

Expand Down
39 changes: 17 additions & 22 deletions packages/backend/src/repoIndexManager.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -525,17 +525,16 @@ describe('RepoIndexManager', () => {

manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

// The onJobCompleted handler reads the job via findUniqueOrThrow, then marks it
// COMPLETED and updates the repo (indexedAt, etc.) in a single repoIndexingJob.update
// with a nested repo update.
(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
status: RepoIndexingJobStatus.PENDING,
});
// The onJobCompleted handler calls repoIndexingJob.update once and then repo.update
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
type: RepoIndexingJobType.INDEX,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repo.update as Mock).mockResolvedValue(repo);
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });

// Get the onCompleted handler
const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];
Expand All@@ -552,22 +551,20 @@ describe('RepoIndexManager', () => {

await onCompletedHandler(mockJob);

// The job status and indexedAt must be written together (single transaction) to
// close the race where the scheduler sees a completed job but a stale indexedAt.
expect(mockPrisma.repoIndexingJob.update).toHaveBeenCalledWith(
expect.objectContaining({
where: { id: 'job-1' },
data: expect.objectContaining({
status: RepoIndexingJobStatus.COMPLETED,
completedAt: expect.any(Date),
}),
})
);

expect(mockPrisma.repo.update).toHaveBeenCalledWith(
expect.objectContaining({
where: { id: repo.id },
data: expect.objectContaining({
indexedAt: expect.any(Date),
indexedCommitHash: 'abc123',
repo: {
update: expect.objectContaining({
indexedAt: expect.any(Date),
indexedCommitHash: 'abc123',
}),
},
}),
})
);
Expand DownExpand Up@@ -754,14 +751,12 @@ describe('RepoIndexManager', () => {
manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
status: RepoIndexingJobStatus.PENDING,
});
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
type: RepoIndexingJobType.CLEANUP,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });
(mockPrisma.repo.delete as Mock).mockResolvedValue(repo);

const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];
Expand DownExpand Up@@ -840,13 +835,13 @@ describe('RepoIndexManager', () => {

manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
type: RepoIndexingJobType.INDEX,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repo.update as Mock).mockResolvedValue(repo);
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });

const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];

Expand All@@ -867,9 +862,9 @@ describe('RepoIndexManager', () => {
data: expect.objectContaining({
status: RepoIndexingJobStatus.COMPLETED,
repo: {
update: {
update: expect.objectContaining({
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
},
}),
},
}),
})
Expand Down
65 changes: 38 additions & 27 deletions packages/backend/src/repoIndexManager.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -545,23 +545,16 @@ export class RepoIndexManager {
private async onJobCompleted(job: Job<JobPayload>) {
try {
const logger = createJobLogger(job.data.jobId);
const jobData = await this.db.repoIndexingJob.update({
const jobData = await this.db.repoIndexingJob.findUniqueOrThrow({
where: { id: job.data.jobId },
data: {
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
repo: {
update: {
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
}
}
},
include: {
repo: true,
}
});

const jobTypeLabel = getJobTypePrometheusLabel(jobData.type);
// @note: capture this before the update below, since the update sets indexedAt.
const isFirstIndex = jobData.repo.indexedAt === null;

if (jobData.type === RepoIndexingJobType.INDEX) {
const { path: repoPath } = getRepoPath(jobData.repo);
Expand All@@ -576,29 +569,47 @@ export class RepoIndexManager {

const jobMetadata = repoIndexingJobMetadataSchema.parse(jobData.metadata);

const repo = await this.db.repo.update({
where: { id: jobData.repoId },
const { repo } = await this.db.repoIndexingJob.update({
where: { id: job.data.jobId },
data: {
indexedAt: new Date(),
indexedCommitHash: commitHash,
pushedAt: pushedAt,
metadata: {
...(jobData.repo.metadata as RepoMetadata),
indexedRevisions: jobMetadata.indexedRevisions,
} satisfies RepoMetadata,
// @note: always update the default branch. While this field can be set
// during connection syncing, by setting it here we ensure that a) the
// default branch is as up to date as possible (since repo indexing happens
// more frequently than connection syncing) and b) for hosts where it is
// impossible to determine the default branch from the host's API
// (e.g., generic git url), we still set the default branch here.
defaultBranch: defaultBranch,
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
repo: {
update: {
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
indexedAt: new Date(),
indexedCommitHash: commitHash,
pushedAt: pushedAt,
metadata: {
...(jobData.repo.metadata as RepoMetadata),
indexedRevisions: jobMetadata.indexedRevisions,
} satisfies RepoMetadata,
// @note: always update the default branch. While this field can be set
// during connection syncing, by setting it here we ensure that a) the
// default branch is as up to date as possible (since repo indexing happens
// more frequently than connection syncing) and b) for hosts where it is
// impossible to determine the default branch from the host's API
// (e.g., generic git url), we still set the default branch here.
defaultBranch: defaultBranch,
}
}
},
include: {
repo: true,
}
});

logger.debug(`Completed index job ${job.data.jobId} for repo ${repo.name} (id: ${repo.id})`);
}
else if (jobData.type === RepoIndexingJobType.CLEANUP) {
await this.db.repoIndexingJob.update({
where: { id: job.data.jobId },
data: {
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
}
});

const repo = await this.db.repo.delete({
where: { id: jobData.repoId },
});
Expand All@@ -610,7 +621,7 @@ export class RepoIndexManager {
this.promClient.activeRepoIndexJobs.dec({ repo: job.data.repoName, type: jobTypeLabel });
this.promClient.repoIndexJobSuccessTotal.inc({ repo: job.data.repoName, type: jobTypeLabel });

if (jobData.type === RepoIndexingJobType.INDEX && jobData.repo.indexedAt === null) {
if (jobData.type === RepoIndexingJobType.INDEX && isFirstIndex) {
captureEvent('backend_repo_first_indexed', {
repoId: job.data.repoId,
type: jobData.repo.external_codeHostType,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(backend): prevent duplicate index jobs from indexedAt race#1298

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

Merged
brendan-kellam merged 2 commits into from
Jun 10, 2026
Merged

fix(backend): prevent duplicate index jobs from indexedAt race #1298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74ba58a
fix(backend): prevent duplicate index jobs from indexedAt race
brendan-kellam Jun 10, 2026
6b2b9ea
docs: add CHANGELOG entry for #1298
brendan-kellam Jun 10, 2026
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Surfaced an actionable error when the Lighthouse licensing service is unreachable, instead of a generic "unexpected error". [#1293](https://github.com/sourcebot-dev/sourcebot/pull/1293)
- Fixed the selected language model rapidly flipping in local storage after a language model was removed. [#1295](https://github.com/sourcebot-dev/sourcebot/pull/1295)
- Fixed issue where using multiple identity providers of the same type (e.g., gitlab) would result in unexpected behaviours. [#1177](https://github.com/sourcebot-dev/sourcebot/pull/1177)
- Fixed a race condition where large repositories could be indexed twice within a single reindex interval. [#1298](https://github.com/sourcebot-dev/sourcebot/pull/1298)

## [5.0.1] - 2026-06-04

Expand Down
39 changes: 17 additions & 22 deletions packages/backend/src/repoIndexManager.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -525,17 +525,16 @@ describe('RepoIndexManager', () => {

manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

// The onJobCompleted handler reads the job via findUniqueOrThrow, then marks it
// COMPLETED and updates the repo (indexedAt, etc.) in a single repoIndexingJob.update
// with a nested repo update.
(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
status: RepoIndexingJobStatus.PENDING,
});
// The onJobCompleted handler calls repoIndexingJob.update once and then repo.update
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
type: RepoIndexingJobType.INDEX,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repo.update as Mock).mockResolvedValue(repo);
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });

// Get the onCompleted handler
const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];
Expand All@@ -552,22 +551,20 @@ describe('RepoIndexManager', () => {

await onCompletedHandler(mockJob);

// The job status and indexedAt must be written together (single transaction) to
// close the race where the scheduler sees a completed job but a stale indexedAt.
expect(mockPrisma.repoIndexingJob.update).toHaveBeenCalledWith(
expect.objectContaining({
where: { id: 'job-1' },
data: expect.objectContaining({
status: RepoIndexingJobStatus.COMPLETED,
completedAt: expect.any(Date),
}),
})
);

expect(mockPrisma.repo.update).toHaveBeenCalledWith(
expect.objectContaining({
where: { id: repo.id },
data: expect.objectContaining({
indexedAt: expect.any(Date),
indexedCommitHash: 'abc123',
repo: {
update: expect.objectContaining({
indexedAt: expect.any(Date),
indexedCommitHash: 'abc123',
}),
},
}),
})
);
Expand DownExpand Up@@ -754,14 +751,12 @@ describe('RepoIndexManager', () => {
manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
status: RepoIndexingJobStatus.PENDING,
});
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
type: RepoIndexingJobType.CLEANUP,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });
(mockPrisma.repo.delete as Mock).mockResolvedValue(repo);

const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];
Expand DownExpand Up@@ -840,13 +835,13 @@ describe('RepoIndexManager', () => {

manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
type: RepoIndexingJobType.INDEX,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repo.update as Mock).mockResolvedValue(repo);
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });

const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];

Expand All@@ -867,9 +862,9 @@ describe('RepoIndexManager', () => {
data: expect.objectContaining({
status: RepoIndexingJobStatus.COMPLETED,
repo: {
update: {
update: expect.objectContaining({
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
},
}),
},
}),
})
Expand Down
65 changes: 38 additions & 27 deletions packages/backend/src/repoIndexManager.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -545,23 +545,16 @@ export class RepoIndexManager {
private async onJobCompleted(job: Job<JobPayload>) {
try {
const logger = createJobLogger(job.data.jobId);
const jobData = await this.db.repoIndexingJob.update({
const jobData = await this.db.repoIndexingJob.findUniqueOrThrow({
where: { id: job.data.jobId },
data: {
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
repo: {
update: {
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
}
}
},
include: {
repo: true,
}
});

const jobTypeLabel = getJobTypePrometheusLabel(jobData.type);
// @note: capture this before the update below, since the update sets indexedAt.
const isFirstIndex = jobData.repo.indexedAt === null;

if (jobData.type === RepoIndexingJobType.INDEX) {
const { path: repoPath } = getRepoPath(jobData.repo);
Expand All@@ -576,29 +569,47 @@ export class RepoIndexManager {

const jobMetadata = repoIndexingJobMetadataSchema.parse(jobData.metadata);

const repo = await this.db.repo.update({
where: { id: jobData.repoId },
const { repo } = await this.db.repoIndexingJob.update({
where: { id: job.data.jobId },
data: {
indexedAt: new Date(),
indexedCommitHash: commitHash,
pushedAt: pushedAt,
metadata: {
...(jobData.repo.metadata as RepoMetadata),
indexedRevisions: jobMetadata.indexedRevisions,
} satisfies RepoMetadata,
// @note: always update the default branch. While this field can be set
// during connection syncing, by setting it here we ensure that a) the
// default branch is as up to date as possible (since repo indexing happens
// more frequently than connection syncing) and b) for hosts where it is
// impossible to determine the default branch from the host's API
// (e.g., generic git url), we still set the default branch here.
defaultBranch: defaultBranch,
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
repo: {
update: {
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
indexedAt: new Date(),
indexedCommitHash: commitHash,
pushedAt: pushedAt,
metadata: {
...(jobData.repo.metadata as RepoMetadata),
indexedRevisions: jobMetadata.indexedRevisions,
} satisfies RepoMetadata,
// @note: always update the default branch. While this field can be set
// during connection syncing, by setting it here we ensure that a) the
// default branch is as up to date as possible (since repo indexing happens
// more frequently than connection syncing) and b) for hosts where it is
// impossible to determine the default branch from the host's API
// (e.g., generic git url), we still set the default branch here.
defaultBranch: defaultBranch,
}
}
},
include: {
repo: true,
}
});

logger.debug(`Completed index job ${job.data.jobId} for repo ${repo.name} (id: ${repo.id})`);
}
else if (jobData.type === RepoIndexingJobType.CLEANUP) {
await this.db.repoIndexingJob.update({
where: { id: job.data.jobId },
data: {
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
}
});

const repo = await this.db.repo.delete({
where: { id: jobData.repoId },
});
Expand All@@ -610,7 +621,7 @@ export class RepoIndexManager {
this.promClient.activeRepoIndexJobs.dec({ repo: job.data.repoName, type: jobTypeLabel });
this.promClient.repoIndexJobSuccessTotal.inc({ repo: job.data.repoName, type: jobTypeLabel });

if (jobData.type === RepoIndexingJobType.INDEX && jobData.repo.indexedAt === null) {
if (jobData.type === RepoIndexingJobType.INDEX && isFirstIndex) {
captureEvent('backend_repo_first_indexed', {
repoId: job.data.repoId,
type: jobData.repo.external_codeHostType,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(backend): prevent duplicate index jobs from indexedAt race#1298

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

Merged
brendan-kellam merged 2 commits into from
Jun 10, 2026
Merged

fix(backend): prevent duplicate index jobs from indexedAt race #1298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74ba58a
fix(backend): prevent duplicate index jobs from indexedAt race
brendan-kellam Jun 10, 2026
6b2b9ea
docs: add CHANGELOG entry for #1298
brendan-kellam Jun 10, 2026
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Surfaced an actionable error when the Lighthouse licensing service is unreachable, instead of a generic "unexpected error". [#1293](https://github.com/sourcebot-dev/sourcebot/pull/1293)
- Fixed the selected language model rapidly flipping in local storage after a language model was removed. [#1295](https://github.com/sourcebot-dev/sourcebot/pull/1295)
- Fixed issue where using multiple identity providers of the same type (e.g., gitlab) would result in unexpected behaviours. [#1177](https://github.com/sourcebot-dev/sourcebot/pull/1177)
- Fixed a race condition where large repositories could be indexed twice within a single reindex interval. [#1298](https://github.com/sourcebot-dev/sourcebot/pull/1298)

## [5.0.1] - 2026-06-04

Expand Down
39 changes: 17 additions & 22 deletions packages/backend/src/repoIndexManager.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -525,17 +525,16 @@ describe('RepoIndexManager', () => {

manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

// The onJobCompleted handler reads the job via findUniqueOrThrow, then marks it
// COMPLETED and updates the repo (indexedAt, etc.) in a single repoIndexingJob.update
// with a nested repo update.
(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
status: RepoIndexingJobStatus.PENDING,
});
// The onJobCompleted handler calls repoIndexingJob.update once and then repo.update
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
type: RepoIndexingJobType.INDEX,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repo.update as Mock).mockResolvedValue(repo);
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });

// Get the onCompleted handler
const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];
Expand All@@ -552,22 +551,20 @@ describe('RepoIndexManager', () => {

await onCompletedHandler(mockJob);

// The job status and indexedAt must be written together (single transaction) to
// close the race where the scheduler sees a completed job but a stale indexedAt.
expect(mockPrisma.repoIndexingJob.update).toHaveBeenCalledWith(
expect.objectContaining({
where: { id: 'job-1' },
data: expect.objectContaining({
status: RepoIndexingJobStatus.COMPLETED,
completedAt: expect.any(Date),
}),
})
);

expect(mockPrisma.repo.update).toHaveBeenCalledWith(
expect.objectContaining({
where: { id: repo.id },
data: expect.objectContaining({
indexedAt: expect.any(Date),
indexedCommitHash: 'abc123',
repo: {
update: expect.objectContaining({
indexedAt: expect.any(Date),
indexedCommitHash: 'abc123',
}),
},
}),
})
);
Expand DownExpand Up@@ -754,14 +751,12 @@ describe('RepoIndexManager', () => {
manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
status: RepoIndexingJobStatus.PENDING,
});
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
type: RepoIndexingJobType.CLEANUP,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });
(mockPrisma.repo.delete as Mock).mockResolvedValue(repo);

const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];
Expand DownExpand Up@@ -840,13 +835,13 @@ describe('RepoIndexManager', () => {

manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
type: RepoIndexingJobType.INDEX,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repo.update as Mock).mockResolvedValue(repo);
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });

const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];

Expand All@@ -867,9 +862,9 @@ describe('RepoIndexManager', () => {
data: expect.objectContaining({
status: RepoIndexingJobStatus.COMPLETED,
repo: {
update: {
update: expect.objectContaining({
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
},
}),
},
}),
})
Expand Down
65 changes: 38 additions & 27 deletions packages/backend/src/repoIndexManager.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -545,23 +545,16 @@ export class RepoIndexManager {
private async onJobCompleted(job: Job<JobPayload>) {
try {
const logger = createJobLogger(job.data.jobId);
const jobData = await this.db.repoIndexingJob.update({
const jobData = await this.db.repoIndexingJob.findUniqueOrThrow({
where: { id: job.data.jobId },
data: {
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
repo: {
update: {
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
}
}
},
include: {
repo: true,
}
});

const jobTypeLabel = getJobTypePrometheusLabel(jobData.type);
// @note: capture this before the update below, since the update sets indexedAt.
const isFirstIndex = jobData.repo.indexedAt === null;

if (jobData.type === RepoIndexingJobType.INDEX) {
const { path: repoPath } = getRepoPath(jobData.repo);
Expand All@@ -576,29 +569,47 @@ export class RepoIndexManager {

const jobMetadata = repoIndexingJobMetadataSchema.parse(jobData.metadata);

const repo = await this.db.repo.update({
where: { id: jobData.repoId },
const { repo } = await this.db.repoIndexingJob.update({
where: { id: job.data.jobId },
data: {
indexedAt: new Date(),
indexedCommitHash: commitHash,
pushedAt: pushedAt,
metadata: {
...(jobData.repo.metadata as RepoMetadata),
indexedRevisions: jobMetadata.indexedRevisions,
} satisfies RepoMetadata,
// @note: always update the default branch. While this field can be set
// during connection syncing, by setting it here we ensure that a) the
// default branch is as up to date as possible (since repo indexing happens
// more frequently than connection syncing) and b) for hosts where it is
// impossible to determine the default branch from the host's API
// (e.g., generic git url), we still set the default branch here.
defaultBranch: defaultBranch,
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
repo: {
update: {
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
indexedAt: new Date(),
indexedCommitHash: commitHash,
pushedAt: pushedAt,
metadata: {
...(jobData.repo.metadata as RepoMetadata),
indexedRevisions: jobMetadata.indexedRevisions,
} satisfies RepoMetadata,
// @note: always update the default branch. While this field can be set
// during connection syncing, by setting it here we ensure that a) the
// default branch is as up to date as possible (since repo indexing happens
// more frequently than connection syncing) and b) for hosts where it is
// impossible to determine the default branch from the host's API
// (e.g., generic git url), we still set the default branch here.
defaultBranch: defaultBranch,
}
}
},
include: {
repo: true,
}
});

logger.debug(`Completed index job ${job.data.jobId} for repo ${repo.name} (id: ${repo.id})`);
}
else if (jobData.type === RepoIndexingJobType.CLEANUP) {
await this.db.repoIndexingJob.update({
where: { id: job.data.jobId },
data: {
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
}
});

const repo = await this.db.repo.delete({
where: { id: jobData.repoId },
});
Expand All@@ -610,7 +621,7 @@ export class RepoIndexManager {
this.promClient.activeRepoIndexJobs.dec({ repo: job.data.repoName, type: jobTypeLabel });
this.promClient.repoIndexJobSuccessTotal.inc({ repo: job.data.repoName, type: jobTypeLabel });

if (jobData.type === RepoIndexingJobType.INDEX && jobData.repo.indexedAt === null) {
if (jobData.type === RepoIndexingJobType.INDEX && isFirstIndex) {
captureEvent('backend_repo_first_indexed', {
repoId: job.data.repoId,
type: jobData.repo.external_codeHostType,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

fix(backend): prevent duplicate index jobs from indexedAt race#1298

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

Merged
brendan-kellam merged 2 commits into from
Jun 10, 2026
Merged

fix(backend): prevent duplicate index jobs from indexedAt race #1298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74ba58a
fix(backend): prevent duplicate index jobs from indexedAt race
brendan-kellam Jun 10, 2026
6b2b9ea
docs: add CHANGELOG entry for #1298
brendan-kellam Jun 10, 2026
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Surfaced an actionable error when the Lighthouse licensing service is unreachable, instead of a generic "unexpected error". [#1293](https://github.com/sourcebot-dev/sourcebot/pull/1293)
- Fixed the selected language model rapidly flipping in local storage after a language model was removed. [#1295](https://github.com/sourcebot-dev/sourcebot/pull/1295)
- Fixed issue where using multiple identity providers of the same type (e.g., gitlab) would result in unexpected behaviours. [#1177](https://github.com/sourcebot-dev/sourcebot/pull/1177)
- Fixed a race condition where large repositories could be indexed twice within a single reindex interval. [#1298](https://github.com/sourcebot-dev/sourcebot/pull/1298)

## [5.0.1] - 2026-06-04

Expand Down
39 changes: 17 additions & 22 deletions packages/backend/src/repoIndexManager.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -525,17 +525,16 @@ describe('RepoIndexManager', () => {

manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

// The onJobCompleted handler reads the job via findUniqueOrThrow, then marks it
// COMPLETED and updates the repo (indexedAt, etc.) in a single repoIndexingJob.update
// with a nested repo update.
(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
status: RepoIndexingJobStatus.PENDING,
});
// The onJobCompleted handler calls repoIndexingJob.update once and then repo.update
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
type: RepoIndexingJobType.INDEX,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repo.update as Mock).mockResolvedValue(repo);
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });

// Get the onCompleted handler
const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];
Expand All@@ -552,22 +551,20 @@ describe('RepoIndexManager', () => {

await onCompletedHandler(mockJob);

// The job status and indexedAt must be written together (single transaction) to
// close the race where the scheduler sees a completed job but a stale indexedAt.
expect(mockPrisma.repoIndexingJob.update).toHaveBeenCalledWith(
expect.objectContaining({
where: { id: 'job-1' },
data: expect.objectContaining({
status: RepoIndexingJobStatus.COMPLETED,
completedAt: expect.any(Date),
}),
})
);

expect(mockPrisma.repo.update).toHaveBeenCalledWith(
expect.objectContaining({
where: { id: repo.id },
data: expect.objectContaining({
indexedAt: expect.any(Date),
indexedCommitHash: 'abc123',
repo: {
update: expect.objectContaining({
indexedAt: expect.any(Date),
indexedCommitHash: 'abc123',
}),
},
}),
})
);
Expand DownExpand Up@@ -754,14 +751,12 @@ describe('RepoIndexManager', () => {
manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
status: RepoIndexingJobStatus.PENDING,
});
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
type: RepoIndexingJobType.CLEANUP,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });
(mockPrisma.repo.delete as Mock).mockResolvedValue(repo);

const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];
Expand DownExpand Up@@ -840,13 +835,13 @@ describe('RepoIndexManager', () => {

manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
type: RepoIndexingJobType.INDEX,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repo.update as Mock).mockResolvedValue(repo);
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });

const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];

Expand All@@ -867,9 +862,9 @@ describe('RepoIndexManager', () => {
data: expect.objectContaining({
status: RepoIndexingJobStatus.COMPLETED,
repo: {
update: {
update: expect.objectContaining({
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
},
}),
},
}),
})
Expand Down
65 changes: 38 additions & 27 deletions packages/backend/src/repoIndexManager.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -545,23 +545,16 @@ export class RepoIndexManager {
private async onJobCompleted(job: Job<JobPayload>) {
try {
const logger = createJobLogger(job.data.jobId);
const jobData = await this.db.repoIndexingJob.update({
const jobData = await this.db.repoIndexingJob.findUniqueOrThrow({
where: { id: job.data.jobId },
data: {
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
repo: {
update: {
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
}
}
},
include: {
repo: true,
}
});

const jobTypeLabel = getJobTypePrometheusLabel(jobData.type);
// @note: capture this before the update below, since the update sets indexedAt.
const isFirstIndex = jobData.repo.indexedAt === null;

if (jobData.type === RepoIndexingJobType.INDEX) {
const { path: repoPath } = getRepoPath(jobData.repo);
Expand All@@ -576,29 +569,47 @@ export class RepoIndexManager {

const jobMetadata = repoIndexingJobMetadataSchema.parse(jobData.metadata);

const repo = await this.db.repo.update({
where: { id: jobData.repoId },
const { repo } = await this.db.repoIndexingJob.update({
where: { id: job.data.jobId },
data: {
indexedAt: new Date(),
indexedCommitHash: commitHash,
pushedAt: pushedAt,
metadata: {
...(jobData.repo.metadata as RepoMetadata),
indexedRevisions: jobMetadata.indexedRevisions,
} satisfies RepoMetadata,
// @note: always update the default branch. While this field can be set
// during connection syncing, by setting it here we ensure that a) the
// default branch is as up to date as possible (since repo indexing happens
// more frequently than connection syncing) and b) for hosts where it is
// impossible to determine the default branch from the host's API
// (e.g., generic git url), we still set the default branch here.
defaultBranch: defaultBranch,
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
repo: {
update: {
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
indexedAt: new Date(),
indexedCommitHash: commitHash,
pushedAt: pushedAt,
metadata: {
...(jobData.repo.metadata as RepoMetadata),
indexedRevisions: jobMetadata.indexedRevisions,
} satisfies RepoMetadata,
// @note: always update the default branch. While this field can be set
// during connection syncing, by setting it here we ensure that a) the
// default branch is as up to date as possible (since repo indexing happens
// more frequently than connection syncing) and b) for hosts where it is
// impossible to determine the default branch from the host's API
// (e.g., generic git url), we still set the default branch here.
defaultBranch: defaultBranch,
}
}
},
include: {
repo: true,
}
});

logger.debug(`Completed index job ${job.data.jobId} for repo ${repo.name} (id: ${repo.id})`);
}
else if (jobData.type === RepoIndexingJobType.CLEANUP) {
await this.db.repoIndexingJob.update({
where: { id: job.data.jobId },
data: {
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
}
});

const repo = await this.db.repo.delete({
where: { id: jobData.repoId },
});
Expand All@@ -610,7 +621,7 @@ export class RepoIndexManager {
this.promClient.activeRepoIndexJobs.dec({ repo: job.data.repoName, type: jobTypeLabel });
this.promClient.repoIndexJobSuccessTotal.inc({ repo: job.data.repoName, type: jobTypeLabel });

if (jobData.type === RepoIndexingJobType.INDEX && jobData.repo.indexedAt === null) {
if (jobData.type === RepoIndexingJobType.INDEX && isFirstIndex) {
captureEvent('backend_repo_first_indexed', {
repoId: job.data.repoId,
type: jobData.repo.external_codeHostType,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(backend): prevent duplicate index jobs from indexedAt race#1298

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

Merged
brendan-kellam merged 2 commits into from
Jun 10, 2026
Merged

fix(backend): prevent duplicate index jobs from indexedAt race #1298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74ba58a
fix(backend): prevent duplicate index jobs from indexedAt race
brendan-kellam Jun 10, 2026
6b2b9ea
docs: add CHANGELOG entry for #1298
brendan-kellam Jun 10, 2026
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Surfaced an actionable error when the Lighthouse licensing service is unreachable, instead of a generic "unexpected error". [#1293](https://github.com/sourcebot-dev/sourcebot/pull/1293)
- Fixed the selected language model rapidly flipping in local storage after a language model was removed. [#1295](https://github.com/sourcebot-dev/sourcebot/pull/1295)
- Fixed issue where using multiple identity providers of the same type (e.g., gitlab) would result in unexpected behaviours. [#1177](https://github.com/sourcebot-dev/sourcebot/pull/1177)
- Fixed a race condition where large repositories could be indexed twice within a single reindex interval. [#1298](https://github.com/sourcebot-dev/sourcebot/pull/1298)

## [5.0.1] - 2026-06-04

Expand Down
39 changes: 17 additions & 22 deletions packages/backend/src/repoIndexManager.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -525,17 +525,16 @@ describe('RepoIndexManager', () => {

manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

// The onJobCompleted handler reads the job via findUniqueOrThrow, then marks it
// COMPLETED and updates the repo (indexedAt, etc.) in a single repoIndexingJob.update
// with a nested repo update.
(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
status: RepoIndexingJobStatus.PENDING,
});
// The onJobCompleted handler calls repoIndexingJob.update once and then repo.update
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
type: RepoIndexingJobType.INDEX,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repo.update as Mock).mockResolvedValue(repo);
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });

// Get the onCompleted handler
const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];
Expand All@@ -552,22 +551,20 @@ describe('RepoIndexManager', () => {

await onCompletedHandler(mockJob);

// The job status and indexedAt must be written together (single transaction) to
// close the race where the scheduler sees a completed job but a stale indexedAt.
expect(mockPrisma.repoIndexingJob.update).toHaveBeenCalledWith(
expect.objectContaining({
where: { id: 'job-1' },
data: expect.objectContaining({
status: RepoIndexingJobStatus.COMPLETED,
completedAt: expect.any(Date),
}),
})
);

expect(mockPrisma.repo.update).toHaveBeenCalledWith(
expect.objectContaining({
where: { id: repo.id },
data: expect.objectContaining({
indexedAt: expect.any(Date),
indexedCommitHash: 'abc123',
repo: {
update: expect.objectContaining({
indexedAt: expect.any(Date),
indexedCommitHash: 'abc123',
}),
},
}),
})
);
Expand DownExpand Up@@ -754,14 +751,12 @@ describe('RepoIndexManager', () => {
manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
status: RepoIndexingJobStatus.PENDING,
});
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
type: RepoIndexingJobType.CLEANUP,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });
(mockPrisma.repo.delete as Mock).mockResolvedValue(repo);

const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];
Expand DownExpand Up@@ -840,13 +835,13 @@ describe('RepoIndexManager', () => {

manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
type: RepoIndexingJobType.INDEX,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repo.update as Mock).mockResolvedValue(repo);
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });

const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];

Expand All@@ -867,9 +862,9 @@ describe('RepoIndexManager', () => {
data: expect.objectContaining({
status: RepoIndexingJobStatus.COMPLETED,
repo: {
update: {
update: expect.objectContaining({
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
},
}),
},
}),
})
Expand Down
65 changes: 38 additions & 27 deletions packages/backend/src/repoIndexManager.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -545,23 +545,16 @@ export class RepoIndexManager {
private async onJobCompleted(job: Job<JobPayload>) {
try {
const logger = createJobLogger(job.data.jobId);
const jobData = await this.db.repoIndexingJob.update({
const jobData = await this.db.repoIndexingJob.findUniqueOrThrow({
where: { id: job.data.jobId },
data: {
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
repo: {
update: {
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
}
}
},
include: {
repo: true,
}
});

const jobTypeLabel = getJobTypePrometheusLabel(jobData.type);
// @note: capture this before the update below, since the update sets indexedAt.
const isFirstIndex = jobData.repo.indexedAt === null;

if (jobData.type === RepoIndexingJobType.INDEX) {
const { path: repoPath } = getRepoPath(jobData.repo);
Expand All@@ -576,29 +569,47 @@ export class RepoIndexManager {

const jobMetadata = repoIndexingJobMetadataSchema.parse(jobData.metadata);

const repo = await this.db.repo.update({
where: { id: jobData.repoId },
const { repo } = await this.db.repoIndexingJob.update({
where: { id: job.data.jobId },
data: {
indexedAt: new Date(),
indexedCommitHash: commitHash,
pushedAt: pushedAt,
metadata: {
...(jobData.repo.metadata as RepoMetadata),
indexedRevisions: jobMetadata.indexedRevisions,
} satisfies RepoMetadata,
// @note: always update the default branch. While this field can be set
// during connection syncing, by setting it here we ensure that a) the
// default branch is as up to date as possible (since repo indexing happens
// more frequently than connection syncing) and b) for hosts where it is
// impossible to determine the default branch from the host's API
// (e.g., generic git url), we still set the default branch here.
defaultBranch: defaultBranch,
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
repo: {
update: {
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
indexedAt: new Date(),
indexedCommitHash: commitHash,
pushedAt: pushedAt,
metadata: {
...(jobData.repo.metadata as RepoMetadata),
indexedRevisions: jobMetadata.indexedRevisions,
} satisfies RepoMetadata,
// @note: always update the default branch. While this field can be set
// during connection syncing, by setting it here we ensure that a) the
// default branch is as up to date as possible (since repo indexing happens
// more frequently than connection syncing) and b) for hosts where it is
// impossible to determine the default branch from the host's API
// (e.g., generic git url), we still set the default branch here.
defaultBranch: defaultBranch,
}
}
},
include: {
repo: true,
}
});

logger.debug(`Completed index job ${job.data.jobId} for repo ${repo.name} (id: ${repo.id})`);
}
else if (jobData.type === RepoIndexingJobType.CLEANUP) {
await this.db.repoIndexingJob.update({
where: { id: job.data.jobId },
data: {
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
}
});

const repo = await this.db.repo.delete({
where: { id: jobData.repoId },
});
Expand All@@ -610,7 +621,7 @@ export class RepoIndexManager {
this.promClient.activeRepoIndexJobs.dec({ repo: job.data.repoName, type: jobTypeLabel });
this.promClient.repoIndexJobSuccessTotal.inc({ repo: job.data.repoName, type: jobTypeLabel });

if (jobData.type === RepoIndexingJobType.INDEX && jobData.repo.indexedAt === null) {
if (jobData.type === RepoIndexingJobType.INDEX && isFirstIndex) {
captureEvent('backend_repo_first_indexed', {
repoId: job.data.repoId,
type: jobData.repo.external_codeHostType,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(backend): prevent duplicate index jobs from indexedAt race#1298

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

Merged
brendan-kellam merged 2 commits into from
Jun 10, 2026
Merged

fix(backend): prevent duplicate index jobs from indexedAt race #1298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74ba58a
fix(backend): prevent duplicate index jobs from indexedAt race
brendan-kellam Jun 10, 2026
6b2b9ea
docs: add CHANGELOG entry for #1298
brendan-kellam Jun 10, 2026
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Surfaced an actionable error when the Lighthouse licensing service is unreachable, instead of a generic "unexpected error". [#1293](https://github.com/sourcebot-dev/sourcebot/pull/1293)
- Fixed the selected language model rapidly flipping in local storage after a language model was removed. [#1295](https://github.com/sourcebot-dev/sourcebot/pull/1295)
- Fixed issue where using multiple identity providers of the same type (e.g., gitlab) would result in unexpected behaviours. [#1177](https://github.com/sourcebot-dev/sourcebot/pull/1177)
- Fixed a race condition where large repositories could be indexed twice within a single reindex interval. [#1298](https://github.com/sourcebot-dev/sourcebot/pull/1298)

## [5.0.1] - 2026-06-04

Expand Down
39 changes: 17 additions & 22 deletions packages/backend/src/repoIndexManager.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -525,17 +525,16 @@ describe('RepoIndexManager', () => {

manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

// The onJobCompleted handler reads the job via findUniqueOrThrow, then marks it
// COMPLETED and updates the repo (indexedAt, etc.) in a single repoIndexingJob.update
// with a nested repo update.
(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
status: RepoIndexingJobStatus.PENDING,
});
// The onJobCompleted handler calls repoIndexingJob.update once and then repo.update
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
type: RepoIndexingJobType.INDEX,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repo.update as Mock).mockResolvedValue(repo);
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });

// Get the onCompleted handler
const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];
Expand All@@ -552,22 +551,20 @@ describe('RepoIndexManager', () => {

await onCompletedHandler(mockJob);

// The job status and indexedAt must be written together (single transaction) to
// close the race where the scheduler sees a completed job but a stale indexedAt.
expect(mockPrisma.repoIndexingJob.update).toHaveBeenCalledWith(
expect.objectContaining({
where: { id: 'job-1' },
data: expect.objectContaining({
status: RepoIndexingJobStatus.COMPLETED,
completedAt: expect.any(Date),
}),
})
);

expect(mockPrisma.repo.update).toHaveBeenCalledWith(
expect.objectContaining({
where: { id: repo.id },
data: expect.objectContaining({
indexedAt: expect.any(Date),
indexedCommitHash: 'abc123',
repo: {
update: expect.objectContaining({
indexedAt: expect.any(Date),
indexedCommitHash: 'abc123',
}),
},
}),
})
);
Expand DownExpand Up@@ -754,14 +751,12 @@ describe('RepoIndexManager', () => {
manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
status: RepoIndexingJobStatus.PENDING,
});
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
type: RepoIndexingJobType.CLEANUP,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });
(mockPrisma.repo.delete as Mock).mockResolvedValue(repo);

const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];
Expand DownExpand Up@@ -840,13 +835,13 @@ describe('RepoIndexManager', () => {

manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
type: RepoIndexingJobType.INDEX,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repo.update as Mock).mockResolvedValue(repo);
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });

const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];

Expand All@@ -867,9 +862,9 @@ describe('RepoIndexManager', () => {
data: expect.objectContaining({
status: RepoIndexingJobStatus.COMPLETED,
repo: {
update: {
update: expect.objectContaining({
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
},
}),
},
}),
})
Expand Down
65 changes: 38 additions & 27 deletions packages/backend/src/repoIndexManager.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -545,23 +545,16 @@ export class RepoIndexManager {
private async onJobCompleted(job: Job<JobPayload>) {
try {
const logger = createJobLogger(job.data.jobId);
const jobData = await this.db.repoIndexingJob.update({
const jobData = await this.db.repoIndexingJob.findUniqueOrThrow({
where: { id: job.data.jobId },
data: {
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
repo: {
update: {
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
}
}
},
include: {
repo: true,
}
});

const jobTypeLabel = getJobTypePrometheusLabel(jobData.type);
// @note: capture this before the update below, since the update sets indexedAt.
const isFirstIndex = jobData.repo.indexedAt === null;

if (jobData.type === RepoIndexingJobType.INDEX) {
const { path: repoPath } = getRepoPath(jobData.repo);
Expand All@@ -576,29 +569,47 @@ export class RepoIndexManager {

const jobMetadata = repoIndexingJobMetadataSchema.parse(jobData.metadata);

const repo = await this.db.repo.update({
where: { id: jobData.repoId },
const { repo } = await this.db.repoIndexingJob.update({
where: { id: job.data.jobId },
data: {
indexedAt: new Date(),
indexedCommitHash: commitHash,
pushedAt: pushedAt,
metadata: {
...(jobData.repo.metadata as RepoMetadata),
indexedRevisions: jobMetadata.indexedRevisions,
} satisfies RepoMetadata,
// @note: always update the default branch. While this field can be set
// during connection syncing, by setting it here we ensure that a) the
// default branch is as up to date as possible (since repo indexing happens
// more frequently than connection syncing) and b) for hosts where it is
// impossible to determine the default branch from the host's API
// (e.g., generic git url), we still set the default branch here.
defaultBranch: defaultBranch,
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
repo: {
update: {
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
indexedAt: new Date(),
indexedCommitHash: commitHash,
pushedAt: pushedAt,
metadata: {
...(jobData.repo.metadata as RepoMetadata),
indexedRevisions: jobMetadata.indexedRevisions,
} satisfies RepoMetadata,
// @note: always update the default branch. While this field can be set
// during connection syncing, by setting it here we ensure that a) the
// default branch is as up to date as possible (since repo indexing happens
// more frequently than connection syncing) and b) for hosts where it is
// impossible to determine the default branch from the host's API
// (e.g., generic git url), we still set the default branch here.
defaultBranch: defaultBranch,
}
}
},
include: {
repo: true,
}
});

logger.debug(`Completed index job ${job.data.jobId} for repo ${repo.name} (id: ${repo.id})`);
}
else if (jobData.type === RepoIndexingJobType.CLEANUP) {
await this.db.repoIndexingJob.update({
where: { id: job.data.jobId },
data: {
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
}
});

const repo = await this.db.repo.delete({
where: { id: jobData.repoId },
});
Expand All@@ -610,7 +621,7 @@ export class RepoIndexManager {
this.promClient.activeRepoIndexJobs.dec({ repo: job.data.repoName, type: jobTypeLabel });
this.promClient.repoIndexJobSuccessTotal.inc({ repo: job.data.repoName, type: jobTypeLabel });

if (jobData.type === RepoIndexingJobType.INDEX && jobData.repo.indexedAt === null) {
if (jobData.type === RepoIndexingJobType.INDEX && isFirstIndex) {
captureEvent('backend_repo_first_indexed', {
repoId: job.data.repoId,
type: jobData.repo.external_codeHostType,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

fix(backend): prevent duplicate index jobs from indexedAt race#1298

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

Merged
brendan-kellam merged 2 commits into from
Jun 10, 2026
Merged

fix(backend): prevent duplicate index jobs from indexedAt race #1298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74ba58a
fix(backend): prevent duplicate index jobs from indexedAt race
brendan-kellam Jun 10, 2026
6b2b9ea
docs: add CHANGELOG entry for #1298
brendan-kellam Jun 10, 2026
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Surfaced an actionable error when the Lighthouse licensing service is unreachable, instead of a generic "unexpected error". [#1293](https://github.com/sourcebot-dev/sourcebot/pull/1293)
- Fixed the selected language model rapidly flipping in local storage after a language model was removed. [#1295](https://github.com/sourcebot-dev/sourcebot/pull/1295)
- Fixed issue where using multiple identity providers of the same type (e.g., gitlab) would result in unexpected behaviours. [#1177](https://github.com/sourcebot-dev/sourcebot/pull/1177)
- Fixed a race condition where large repositories could be indexed twice within a single reindex interval. [#1298](https://github.com/sourcebot-dev/sourcebot/pull/1298)

## [5.0.1] - 2026-06-04

Expand Down
39 changes: 17 additions & 22 deletions packages/backend/src/repoIndexManager.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -525,17 +525,16 @@ describe('RepoIndexManager', () => {

manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

// The onJobCompleted handler reads the job via findUniqueOrThrow, then marks it
// COMPLETED and updates the repo (indexedAt, etc.) in a single repoIndexingJob.update
// with a nested repo update.
(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
status: RepoIndexingJobStatus.PENDING,
});
// The onJobCompleted handler calls repoIndexingJob.update once and then repo.update
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
type: RepoIndexingJobType.INDEX,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repo.update as Mock).mockResolvedValue(repo);
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });

// Get the onCompleted handler
const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];
Expand All@@ -552,22 +551,20 @@ describe('RepoIndexManager', () => {

await onCompletedHandler(mockJob);

// The job status and indexedAt must be written together (single transaction) to
// close the race where the scheduler sees a completed job but a stale indexedAt.
expect(mockPrisma.repoIndexingJob.update).toHaveBeenCalledWith(
expect.objectContaining({
where: { id: 'job-1' },
data: expect.objectContaining({
status: RepoIndexingJobStatus.COMPLETED,
completedAt: expect.any(Date),
}),
})
);

expect(mockPrisma.repo.update).toHaveBeenCalledWith(
expect.objectContaining({
where: { id: repo.id },
data: expect.objectContaining({
indexedAt: expect.any(Date),
indexedCommitHash: 'abc123',
repo: {
update: expect.objectContaining({
indexedAt: expect.any(Date),
indexedCommitHash: 'abc123',
}),
},
}),
})
);
Expand DownExpand Up@@ -754,14 +751,12 @@ describe('RepoIndexManager', () => {
manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
status: RepoIndexingJobStatus.PENDING,
});
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
type: RepoIndexingJobType.CLEANUP,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });
(mockPrisma.repo.delete as Mock).mockResolvedValue(repo);

const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];
Expand DownExpand Up@@ -840,13 +835,13 @@ describe('RepoIndexManager', () => {

manager = new RepoIndexManager(mockPrisma, mockSettings, mockRedis, mockPromClient as any);

(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({
(mockPrisma.repoIndexingJob.findUniqueOrThrow as Mock).mockResolvedValue({
type: RepoIndexingJobType.INDEX,
repoId: repo.id,
repo,
metadata: {},
});
(mockPrisma.repo.update as Mock).mockResolvedValue(repo);
(mockPrisma.repoIndexingJob.update as Mock).mockResolvedValue({ repo });

const onCompletedHandler = mockWorkerOn.mock.calls.find((call: unknown[]) => call[0] === 'completed')?.[1];

Expand All@@ -867,9 +862,9 @@ describe('RepoIndexManager', () => {
data: expect.objectContaining({
status: RepoIndexingJobStatus.COMPLETED,
repo: {
update: {
update: expect.objectContaining({
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
},
}),
},
}),
})
Expand Down
65 changes: 38 additions & 27 deletions packages/backend/src/repoIndexManager.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -545,23 +545,16 @@ export class RepoIndexManager {
private async onJobCompleted(job: Job<JobPayload>) {
try {
const logger = createJobLogger(job.data.jobId);
const jobData = await this.db.repoIndexingJob.update({
const jobData = await this.db.repoIndexingJob.findUniqueOrThrow({
where: { id: job.data.jobId },
data: {
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
repo: {
update: {
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
}
}
},
include: {
repo: true,
}
});

const jobTypeLabel = getJobTypePrometheusLabel(jobData.type);
// @note: capture this before the update below, since the update sets indexedAt.
const isFirstIndex = jobData.repo.indexedAt === null;

if (jobData.type === RepoIndexingJobType.INDEX) {
const { path: repoPath } = getRepoPath(jobData.repo);
Expand All@@ -576,29 +569,47 @@ export class RepoIndexManager {

const jobMetadata = repoIndexingJobMetadataSchema.parse(jobData.metadata);

const repo = await this.db.repo.update({
where: { id: jobData.repoId },
const { repo } = await this.db.repoIndexingJob.update({
where: { id: job.data.jobId },
data: {
indexedAt: new Date(),
indexedCommitHash: commitHash,
pushedAt: pushedAt,
metadata: {
...(jobData.repo.metadata as RepoMetadata),
indexedRevisions: jobMetadata.indexedRevisions,
} satisfies RepoMetadata,
// @note: always update the default branch. While this field can be set
// during connection syncing, by setting it here we ensure that a) the
// default branch is as up to date as possible (since repo indexing happens
// more frequently than connection syncing) and b) for hosts where it is
// impossible to determine the default branch from the host's API
// (e.g., generic git url), we still set the default branch here.
defaultBranch: defaultBranch,
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
repo: {
update: {
latestIndexingJobStatus: RepoIndexingJobStatus.COMPLETED,
indexedAt: new Date(),
indexedCommitHash: commitHash,
pushedAt: pushedAt,
metadata: {
...(jobData.repo.metadata as RepoMetadata),
indexedRevisions: jobMetadata.indexedRevisions,
} satisfies RepoMetadata,
// @note: always update the default branch. While this field can be set
// during connection syncing, by setting it here we ensure that a) the
// default branch is as up to date as possible (since repo indexing happens
// more frequently than connection syncing) and b) for hosts where it is
// impossible to determine the default branch from the host's API
// (e.g., generic git url), we still set the default branch here.
defaultBranch: defaultBranch,
}
}
},
include: {
repo: true,
}
});

logger.debug(`Completed index job ${job.data.jobId} for repo ${repo.name} (id: ${repo.id})`);
}
else if (jobData.type === RepoIndexingJobType.CLEANUP) {
await this.db.repoIndexingJob.update({
where: { id: job.data.jobId },
data: {
status: RepoIndexingJobStatus.COMPLETED,
completedAt: new Date(),
}
});

const repo = await this.db.repo.delete({
where: { id: jobData.repoId },
});
Expand All@@ -610,7 +621,7 @@ export class RepoIndexManager {
this.promClient.activeRepoIndexJobs.dec({ repo: job.data.repoName, type: jobTypeLabel });
this.promClient.repoIndexJobSuccessTotal.inc({ repo: job.data.repoName, type: jobTypeLabel });

if (jobData.type === RepoIndexingJobType.INDEX && jobData.repo.indexedAt === null) {
if (jobData.type === RepoIndexingJobType.INDEX && isFirstIndex) {
captureEvent('backend_repo_first_indexed', {
repoId: job.data.repoId,
type: jobData.repo.external_codeHostType,
Expand Down
Loading