Skip to content

fix(sync): upsertIssueRecord is an atomic INSERT ON CONFLICT — closes the race #671

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

Open
yggdrasilworld wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(sync): upsertIssueRecord is an atomic INSERT ON CONFLICT — closes the race #671

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 32 additions & 8 deletions src/github/github-sync.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@ import {
import { EventEmitter2 } from '@nestjs/event-emitter';
import { InjectRepository } from '@nestjs/typeorm';
import { Octokit } from '@octokit/rest';
import {
FindOptionsRelations,
Repository as TypeOrmRepository,
} from 'typeorm';
import { FindOptionsRelations, Repository as TypeOrmRepository } from 'typeorm';
import { ANALYTICS_PLATFORM_INVALIDATE_EVENT } from '../analytics/analytics.events';
import { Issue, Repository } from '../common/entities';
import { IssueState } from '../common/enums';
Expand Down Expand Up @@ -305,10 +302,37 @@ export class GithubSyncService {
githubUpdatedAt: incomingUpdatedAt,
};

const issue = existing
? this.issueRepo.merge(existing, attrs)
: this.issueRepo.create(attrs);
return { issue: await this.issueRepo.save(issue), applied: true };
// Atomic INSERT ... ON CONFLICT DO UPDATE — the prior read-then-save let
// two concurrent syncs both find no row and both INSERT, so one hit the
// unique githubIssueId constraint (#562, regression of #376). The atomic
// upsert makes the write race-safe; the stale-check above still guards
// the update path, and the conflict-update is conditional on the incoming
// row being newer so a stale delivery can't overwrite fresh data.
const githubId = githubIssueId;
await this.issueRepo
.createQueryBuilder()
.insert()
.into(Issue)
.values(attrs as never)
.orUpdate(
[
'number',
'title',
'body',
'state',
'labels',
'githubUrl',
'authorLogin',
'isMaintenanceType',
'closedAt',
'githubUpdatedAt',
'repositoryId',
],
['githubIssueId'],
)
.execute();
const issue = await this.findIssueByGithubIdOrNull(githubId);
return { issue: issue as Issue, applied: true };
}

async findRepositoryByGithubId(
Expand Down