fix: worker stop&start logic #8497
Conversation
WalkthroughWalkthroughThis update introduces a new Changes
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (invoked as PR comments)
Additionally, you can add CodeRabbit Configration File (
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
Out of diff range and nitpick comments (2)
packages/nocodb/src/modules/jobs/redis/jobs.service.ts (2)
Line range hint
38-54: Add error handling and improve logging.Consider adding error handling to the
toggleQueuemethod and improving logging to ensure robustness.- async toggleQueue() { + async toggleQueue(): Promise<void> { try { if (process.env.NC_WORKER_CONTAINER === 'false') { await this.jobsQueue.pause(true); this.logger.log('Queue paused due to NC_WORKER_CONTAINER being false'); } else if (process.env.NC_WORKER_CONTAINER !== 'true') { // resume primary instance queue if there is no worker const workerCount = await this.jobsRedisService.workerCount(); const localWorkerPaused = await this.jobsQueue.isPaused(true); // if there is no worker and primary instance queue is paused, resume it // if there is any worker and primary instance queue is not paused, pause it if (workerCount === 0 && localWorkerPaused) { await this.jobsQueue.resume(true); this.logger.log('Queue resumed due to no workers'); } else if (workerCount > 0 && !localWorkerPaused) { await this.jobsQueue.pause(true); this.logger.log('Queue paused due to active workers'); } } } catch (error) { this.logger.error('Failed to toggle queue', error); } }
Line range hint
56-61: Add error handling and improve logging.Consider adding error handling to the
addmethod and improving logging to ensure robustness.- async add(name: string, data: any) { + async add(name: string, data: any): Promise<Job> { try { await this.toggleQueue(); const job = await this.jobsQueue.add(name, data); this.logger.log(`Job added: ${name}`); return job; } catch (error) { this.logger.error(`Failed to add job: ${name}`, error); throw error; } }
Review Details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (3)
- packages/nocodb/src/interface/Jobs.ts (1 hunks)
- packages/nocodb/src/modules/jobs/jobs/health-check.processor.ts (1 hunks)
- packages/nocodb/src/modules/jobs/redis/jobs.service.ts (2 hunks)
Files skipped from review due to trivial changes (1)
- packages/nocodb/src/interface/Jobs.ts
| async healthCheck() { | ||
| const queue = this.jobsService.jobsQueue as Queue; | ||
|
|
||
| if (queue) { | ||
| queue | ||
| .getJobCounts() | ||
| .then((stats) => { | ||
| // log stats periodically | ||
| this.logger.log({ stats }); | ||
| }) | ||
| .catch((err) => { | ||
| this.logger.error(err); | ||
| }); | ||
| } | ||
| } |
There was a problem hiding this comment.
Add type annotations and improve error handling.
Consider adding type annotations to the healthCheck method and improving error handling to ensure robustness.
- async healthCheck() {
+ async healthCheck(job: Job): Promise<void> {
const queue = this.jobsService.jobsQueue as Queue;
if (queue) {
queue
.getJobCounts()
.then((stats) => {
// log stats periodically
this.logger.log({ stats });
})
.catch((err) => {
this.logger.error('Failed to get job counts', err);
});
} else {
this.logger.warn('Queue is not available');
}
}Committable suggestion
鈥硷笍 IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.
| async healthCheck() { | |
| const queue = this.jobsService.jobsQueue as Queue; | |
| if (queue) { | |
| queue | |
| .getJobCounts() | |
| .then((stats) => { | |
| // log stats periodically | |
| this.logger.log({ stats }); | |
| }) | |
| .catch((err) => { | |
| this.logger.error(err); | |
| }); | |
| } | |
| } | |
| async healthCheck(job: Job): Promise<void> { | |
| const queue = this.jobsService.jobsQueue as Queue; | |
| if (queue) { | |
| queue | |
| .getJobCounts() | |
| .then((stats) => { | |
| // log stats periodically | |
| this.logger.log({ stats }); | |
| }) | |
| .catch((err) => { | |
| this.logger.error('Failed to get job counts', err); | |
| }); | |
| } else { | |
| this.logger.warn('Queue is not available'); | |
| } | |
| } |
|
Uffizzi Preview |
No description provided.