Skip to content

fix: resolve runaway PR reconcile loop from invalid env values #212

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
RealDiligent wants to merge 1 commit into
base: test
Choose a base branch
from
Open

fix: resolve runaway PR reconcile loop from invalid env values #212

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
51 changes: 45 additions & 6 deletions packages/das/src/webhook/pr-reconcile.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,39 @@ const RECONCILE_INTERVAL_MS = Number(
const RECONCILE_WINDOW_DAYS = Number(
process.env.PR_RECONCILE_WINDOW_DAYS ?? 45,
);
const MIN_RECONCILE_INTERVAL_MS = 60_000;
const MAX_RECONCILE_INTERVAL_MS = 24 * 60 * 60 * 1000;
const MIN_RECONCILE_WINDOW_DAYS = 1;
const MAX_RECONCILE_WINDOW_DAYS = 365;

function parseBoundedNumber(
rawValue: number,
defaultValue: number,
minValue: number,
maxValue: number,
): number {
if (!Number.isFinite(rawValue)) return defaultValue;
const normalized = Math.floor(rawValue);
if (normalized < minValue || normalized > maxValue) return defaultValue;
return normalized;
}

@Injectable()
export class PrReconcileService implements OnModuleInit, OnModuleDestroy {
private readonly logger = new Logger(PrReconcileService.name);
private timer: NodeJS.Timeout | null = null;
private readonly reconcileIntervalMs = parseBoundedNumber(
RECONCILE_INTERVAL_MS,
60 * 60 * 1000,
MIN_RECONCILE_INTERVAL_MS,
MAX_RECONCILE_INTERVAL_MS,
);
private readonly reconcileWindowDays = parseBoundedNumber(
RECONCILE_WINDOW_DAYS,
45,
MIN_RECONCILE_WINDOW_DAYS,
MAX_RECONCILE_WINDOW_DAYS,
);

constructor(
@InjectRepository(PullRequest)
Expand All @@ -39,12 +67,22 @@ export class PrReconcileService implements OnModuleInit, OnModuleDestroy {
) {}

onModuleInit(): void {
if (this.reconcileIntervalMs !== RECONCILE_INTERVAL_MS) {
this.logger.warn(
`Invalid PR_RECONCILE_INTERVAL_MS=${String(process.env.PR_RECONCILE_INTERVAL_MS)}; ` +
`using ${this.reconcileIntervalMs}ms`,
);
}
if (this.reconcileWindowDays !== RECONCILE_WINDOW_DAYS) {
this.logger.warn(
`Invalid PR_RECONCILE_WINDOW_DAYS=${String(process.env.PR_RECONCILE_WINDOW_DAYS)}; ` +
`using ${this.reconcileWindowDays} days`,
);
}

// Run once at startup, then on the interval.
void this.reconcile();
this.timer = setInterval(
() => void this.reconcile(),
RECONCILE_INTERVAL_MS,
);
this.timer = setInterval(() => void this.reconcile(), this.reconcileIntervalMs);
}

onModuleDestroy(): void {
Expand All @@ -60,12 +98,13 @@ export class PrReconcileService implements OnModuleInit, OnModuleDestroy {
JOIN repos r ON r.repo_full_name = p.repo_full_name
WHERE p.state = 'OPEN'
AND r.registered = true
AND p.created_at > NOW() - INTERVAL '${RECONCILE_WINDOW_DAYS} days'`,
AND p.created_at > NOW() - make_interval(days => $1::int)`,
[this.reconcileWindowDays],
);

this.logger.log(
`Reconciling ${rows.length} open PRs against GitHub ` +
`(window ${RECONCILE_WINDOW_DAYS}d)`,
`(window ${this.reconcileWindowDays}d)`,
);

for (const row of rows) {
Expand Down