Skip to content
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

Jump to bottom

fix(core): Ensure graceful shutdown for workers #9547

Merged
merged 3 commits into from
May 31, 2024
Merged

fix(core): Ensure graceful shutdown for workers #9547

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92b47d3
fix(core): Ensure graceful shutdown for workers
ivov May 30, 2024
598f1f7
Use `doNotWaitActive` instead
ivov May 30, 2024
01f6329
Send `SIGINT` instead
ivov May 30, 2024
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
21 changes: 17 additions & 4 deletions packages/cli/src/commands/worker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,22 +64,22 @@ export class Worker extends BaseCommand {
this.logger.info('Stopping n8n...');

// Stop accepting new jobs
await Worker.jobQueue.pause(true);
void Worker.jobQueue.pause(true); // do not block so we can report progress
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we instead update queue.pause to pass the second argument (doNotWaitActive) as true instead of leaving a dangling promise here?


try {
await this.externalHooks?.run('n8n.stop', []);

const hardStopTime = Date.now() + this.gracefulShutdownTimeoutInS;
const hardStopTimeMs = Date.now() + this.gracefulShutdownTimeoutInS * 1000;

// Wait for active workflow executions to finish
let count = 0;
while (Object.keys(Worker.runningJobs).length !== 0) {
if (count++ % 4 === 0) {
const waitLeft = Math.ceil((hardStopTime - Date.now()) / 1000);
const waitLeft = Math.ceil((hardStopTimeMs - Date.now()) / 1000);
this.logger.info(
`Waiting for ${
Object.keys(Worker.runningJobs).length
} active executions to finish... (wait ${waitLeft} more seconds)`,
} active executions to finish... (max wait ${waitLeft} more seconds)`,
);
}

Expand Down Expand Up @@ -483,6 +483,19 @@ export class Worker extends BaseCommand {
await this.setupHealthMonitor();
}

if (process.stdout.isTTY) {
process.stdin.setRawMode(true);
process.stdin.resume();
process.stdin.setEncoding('utf8');

process.stdin.on('data', (key: string) => {
// ctrl+c
if (key.charCodeAt(0) === 3) {
void this.stopProcess();
}
});
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could this be moved to BaseCommand.init ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I understand, I think this is only needed for worker and webhook because of their never-resolving promise. start has its own process.stdin listener and I'd rather not change webhook in this PR about workers.


// Make sure that the process does not close
await new Promise(() => {});
}
Expand Down
Loading