Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-06-27 01:19:00 +02:00
Code Issues Projects Releases Wiki Activity

feat: do not lock until migrations are needed (#10170)

Browse Source
This commit is contained in:
Gastón Fournier 2025-06-18 17:40:21 +02:00 committed by GitHub
parent ef3ffc4d94
commit 967df825cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/lib/server-impl.ts
View File

@ -1,7 +1,7 @@
import stoppable, { type StoppableServer } from 'stoppable';
import { promisify } from 'util';
import version from './util/version.js';
import { migrateDb, resetDb } from '../migrator.js';
import { migrateDb, requiresMigration, resetDb } from '../migrator.js';
import getApp from './app.js';
import type MetricsMonitor from './metrics.js';
import { createMetricsMonitor } from './metrics.js';
@ -336,21 +336,25 @@ async function start(
if (config.db.disableMigration) {
logger.info('DB migration: disabled');
} else {
logger.info('DB migration: start');
if (config.flagResolver.isEnabled('migrationLock')) {
logger.info('Running migration with lock');
const lock = withDbLock(config.db, {
lockKey: defaultLockKey,
timeout: defaultTimeout,
logger,
});
await lock(migrateDb)(config);
} else {
logger.info('Running migration without lock');
await migrateDb(config);
}
if (await requiresMigration(config)) {
logger.info('DB migration: start');
if (config.flagResolver.isEnabled('migrationLock')) {
logger.info('Running migration with lock');
const lock = withDbLock(config.db, {
lockKey: defaultLockKey,
timeout: defaultTimeout,
logger,
});
await lock(migrateDb)(config);
} else {
logger.info('Running migration without lock');
await migrateDb(config);
}
logger.info('DB migration: end');
logger.info('DB migration: end');
} else {
logger.info('DB migration: no migration needed');
}
}
} catch (err) {
logger.error('Failed to migrate db', err);

22
src/migrator.ts
View File

@ -40,6 +40,28 @@ export async function migrateDb(
});
}
export async function requiresMigration({
db,
}: Pick<IUnleashConfig, 'db'>): Promise<boolean> {
return noDatabaseUrl(async () => {
const custom = {
...db,
connectionTimeoutMillis: secondsToMilliseconds(10),
};
// disable Intellij/WebStorm from setting verbose CLI argument to db-migrator
process.argv = process.argv.filter((it) => !it.includes('--verbose'));
const dbm = getInstance(true, {
cwd: __dirname,
config: { custom },
env: 'custom',
});
const pendingMigrations = await dbm.check();
return pendingMigrations.length > 0;
});
}
// This exists to ease testing
export async function resetDb({ db }: IUnleashConfig): Promise<void> {
return noDatabaseUrl(async () => {