Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,6 @@ module.exports = {
setupFiles: [ './jest.setup.js' ],

setupFilesAfterEnv: ['./jest.setup.redis-mock.js', './jest.setup.mongo-repl-set.js'],

globalTeardown: './jest.global-teardown.js',
};
9 changes: 9 additions & 0 deletions jest.global-teardown.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const process = require('process');

module.exports = () => {
if (process.env.CI) {
setTimeout(() => {
process.exit(0);
}, 1000);
}
}
6 changes: 3 additions & 3 deletions jest.setup.mongo-repl-set.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ beforeAll(async () => {
* Wait for the replica set to initialize all nodes
*/
do {
await new Promise(resolve => setTimeout(resolve, 1000));
status = await admin.command({ replSetGetStatus: 1 });

const primary = status.members.find(member => member.stateStr === 'PRIMARY');
const secondary = status.members.find(member => member.stateStr === 'SECONDARY');

if (primary && secondary) {
if (primary) {
break;
}

await new Promise(resolve => setTimeout(resolve, 1000));
} while (Date.now() - startTime < timeout);

console.log('✅ Replica set is stable');
Expand Down
16 changes: 9 additions & 7 deletions workers/archiver/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { DatabaseController } from '../../../lib/db/controller';
import { Worker } from '../../../lib/worker';
import * as pkg from '../package.json';
import asyncForEach from '../../../lib/utils/asyncForEach';
import { Collection, Db, GridFSBucket, ObjectId, ObjectID } from 'mongodb';
import axios from 'axios';
import { ReleaseFileData, ReleaseRecord, ReportData, ReportDataByProject } from './types';
Expand Down Expand Up @@ -85,10 +84,13 @@ export default class ArchiverWorker extends Worker {

this.logger.info(`Start archiving at ${startDate}`);

const projects = await this.projectCollection.find({}).toArray();
const projects = await this.projectCollection.find({}).project({
_id: 1,
name: 1
});
const projectsData: ReportDataByProject[] = [];

await asyncForEach(projects, async (project) => {
for await (const project of projects) {
const archivedEventsCount = await this.archiveProjectEvents(project);

const removedReleasesCount = await this.removeOldReleases(project);
Expand All @@ -98,7 +100,7 @@ export default class ArchiverWorker extends Worker {
archivedEventsCount,
removedReleasesCount,
});
});
}

const finishDate = new Date();
const dbSizeOnFinish = (await this.eventsDbConnection.stats()).dataSize;
Expand Down Expand Up @@ -347,9 +349,9 @@ export default class ArchiverWorker extends Worker {
});

this.logger.info('Report notification response:', {
status: response.status,
statusText: response.statusText,
data: response.data
status: response?.status,
statusText: response?.statusText,
data: response?.data
});
}

Expand Down
Loading