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

refactor(benchmark): Rename scaling mode setups #10783

Merged
merged 1 commit into from
Sep 12, 2024
Merged

refactor(benchmark): Rename scaling mode setups #10783

Show file tree
Hide file tree
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
3 changes: 1 addition & 2 deletions packages/@n8n/benchmark/scripts/n8nSetups/postgres/setup.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import path from 'path';
import { fs } from 'zx';

/**
* Creates the needed directories for the queue setup so their
* permissions get set correctly.
* Creates the needed directories so the permissions get set correctly.
*/
export function setup({ runDir }) {
const neededDirs = ['n8n', 'postgres'];
Expand Down
0 ...ipts/n8nSetups/scaling/docker-compose.yml → ...ups/scaling-multi-main/docker-compose.yml
View file
Open in desktop
File renamed without changes.
0 ...mark/scripts/n8nSetups/scaling/nginx.conf → ...s/n8nSetups/scaling-multi-main/nginx.conf
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

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

We now have camelCase and kebab-case mix. In future we can standardize to kebab-case like in cli.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point. Can do it as a followup

File renamed without changes.
3 changes: 1 addition & 2 deletions ...hmark/scripts/n8nSetups/scaling/setup.mjs → ...ts/n8nSetups/scaling-multi-main/setup.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import path from 'path';
import { fs } from 'zx';

/**
* Creates the needed directories for the queue setup so their
* permissions get set correctly.
* Creates the needed directories so the permissions get set correctly.
*/
export function setup({ runDir }) {
const neededDirs = ['n8n-worker1', 'n8n-worker2', 'n8n-main1', 'n8n-main2', 'postgres'];
Expand Down
0 ...cripts/n8nSetups/queue/docker-compose.yml → ...ps/scaling-single-main/docker-compose.yml
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions ...nchmark/scripts/n8nSetups/queue/setup.mjs → ...s/n8nSetups/scaling-single-main/setup.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import path from 'path';
import { fs } from 'zx';

/**
* Creates the needed directories for the queue setup so their
* permissions get set correctly.
* Creates the needed directories so the permissions get set correctly.
*/
export function setup({ runDir }) {
const neededDirs = ['n8n-worker1', 'n8n-worker2', 'n8n-main', 'postgres'];
Expand Down
3 changes: 1 addition & 2 deletions packages/@n8n/benchmark/scripts/n8nSetups/sqlite-legacy/setup.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import path from 'path';
import { fs } from 'zx';

/**
* Creates the needed directories for the queue setup so their
* permissions get set correctly.
* Creates the needed directories so the permissions get set correctly.
*/
export function setup({ runDir }) {
const neededDirs = ['n8n'];
Expand Down
3 changes: 1 addition & 2 deletions packages/@n8n/benchmark/scripts/n8nSetups/sqlite/setup.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import path from 'path';
import { fs } from 'zx';

/**
* Creates the needed directories for the queue setup so their
* permissions get set correctly.
* Creates the needed directories so the permissions get set correctly.
*/
export function setup({ runDir }) {
const neededDirs = ['n8n'];
Expand Down
4 changes: 2 additions & 2 deletions packages/@n8n/benchmark/scripts/runForN8nSetup.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ async function main() {
const duration = argv.duration;

const hasN8nLicense = !!n8nLicenseCert || !!n8nLicenseActivationKey;
if (n8nSetupToUse === 'scaling' && !hasN8nLicense) {
if (n8nSetupToUse === 'scaling-multi-main' && !hasN8nLicense) {
console.error(
'n8n license is required to run the scaling setup. Please provide N8N_LICENSE_CERT or N8N_LICENSE_ACTIVATION_KEY',
'n8n license is required to run the multi-main scaling setup. Please provide N8N_LICENSE_CERT or N8N_LICENSE_ACTIVATION_KEY (and N8N_LICENSE_TENANT_ID if needed)',
);
process.exit(1);
}
Expand Down
Loading