From 0dd15cbe8d8951f4a0b8f72fbb29d6375669c6dd Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Thu, 17 Oct 2024 12:37:00 +0200
Subject: [PATCH] fix(benchmark): Benchmark improvements (#11290)

---
 .../scenarios/binary-data/binary-data.script.js     |  6 ++++++
 .../scenarios/http-node/http-node.script.js         |  6 ++++++
 .../scenarios/js-code-node/js-code-node.script.js   |  7 +++++++
 .../set-node-expressions.script.js                  |  7 +++++++
 ...e-webhook.script.ts => single-webhook.script.js} |  7 +++++++
 .../scaling-multi-main/docker-compose.yml           |  2 +-
 .../n8n-setups/scaling-multi-main/nginx.conf        |  1 +
 packages/@n8n/benchmark/scripts/run-in-cloud.mjs    |  6 ------
 packages/@n8n/benchmark/scripts/vm-benchmark.sh     | 13 -------------
 9 files changed, 35 insertions(+), 20 deletions(-)
 rename packages/@n8n/benchmark/scenarios/single-webhook/{single-webhook.script.ts => single-webhook.script.js} (63%)
 delete mode 100644 packages/@n8n/benchmark/scripts/vm-benchmark.sh

diff --git a/packages/@n8n/benchmark/scenarios/binary-data/binary-data.script.js b/packages/@n8n/benchmark/scenarios/binary-data/binary-data.script.js
index c10e667cbb..28edfdf9ec 100644
--- a/packages/@n8n/benchmark/scenarios/binary-data/binary-data.script.js
+++ b/packages/@n8n/benchmark/scenarios/binary-data/binary-data.script.js
@@ -15,6 +15,12 @@ export default function () {
 
 	const res = http.post(`${apiBaseUrl}/webhook/binary-files-benchmark`, data);
 
+	if (res.status !== 200) {
+		console.error(
+			`Invalid response. Received status ${res.status}. Body: ${JSON.stringify(res.body)}`,
+		);
+	}
+
 	check(res, {
 		'is status 200': (r) => r.status === 200,
 		'has correct content type': (r) =>
diff --git a/packages/@n8n/benchmark/scenarios/http-node/http-node.script.js b/packages/@n8n/benchmark/scenarios/http-node/http-node.script.js
index b391982259..4ecee9d1bd 100644
--- a/packages/@n8n/benchmark/scenarios/http-node/http-node.script.js
+++ b/packages/@n8n/benchmark/scenarios/http-node/http-node.script.js
@@ -6,6 +6,12 @@ const apiBaseUrl = __ENV.API_BASE_URL;
 export default function () {
 	const res = http.post(`${apiBaseUrl}/webhook/benchmark-http-node`);
 
+	if (res.status !== 200) {
+		console.error(
+			`Invalid response. Received status ${res.status}. Body: ${JSON.stringify(res.body)}`,
+		);
+	}
+
 	check(res, {
 		'is status 200': (r) => r.status === 200,
 		'http requests were OK': (r) => {
diff --git a/packages/@n8n/benchmark/scenarios/js-code-node/js-code-node.script.js b/packages/@n8n/benchmark/scenarios/js-code-node/js-code-node.script.js
index 74cef4f441..b2fd8eb315 100644
--- a/packages/@n8n/benchmark/scenarios/js-code-node/js-code-node.script.js
+++ b/packages/@n8n/benchmark/scenarios/js-code-node/js-code-node.script.js
@@ -5,6 +5,13 @@ const apiBaseUrl = __ENV.API_BASE_URL;
 
 export default function () {
 	const res = http.post(`${apiBaseUrl}/webhook/code-node-benchmark`, {});
+
+	if (res.status !== 200) {
+		console.error(
+			`Invalid response. Received status ${res.status}. Body: ${JSON.stringify(res.body)}`,
+		);
+	}
+
 	check(res, {
 		'is status 200': (r) => r.status === 200,
 		'has items in response': (r) => {
diff --git a/packages/@n8n/benchmark/scenarios/set-node-expressions/set-node-expressions.script.js b/packages/@n8n/benchmark/scenarios/set-node-expressions/set-node-expressions.script.js
index 4bea17eb9f..9564fcc53c 100644
--- a/packages/@n8n/benchmark/scenarios/set-node-expressions/set-node-expressions.script.js
+++ b/packages/@n8n/benchmark/scenarios/set-node-expressions/set-node-expressions.script.js
@@ -5,6 +5,13 @@ const apiBaseUrl = __ENV.API_BASE_URL;
 
 export default function () {
 	const res = http.post(`${apiBaseUrl}/webhook/set-expressions-benchmark`, {});
+
+	if (res.status !== 200) {
+		console.error(
+			`Invalid response. Received status ${res.status}. Body: ${JSON.stringify(res.body)}`,
+		);
+	}
+
 	check(res, {
 		'is status 200': (r) => r.status === 200,
 	});
diff --git a/packages/@n8n/benchmark/scenarios/single-webhook/single-webhook.script.ts b/packages/@n8n/benchmark/scenarios/single-webhook/single-webhook.script.js
similarity index 63%
rename from packages/@n8n/benchmark/scenarios/single-webhook/single-webhook.script.ts
rename to packages/@n8n/benchmark/scenarios/single-webhook/single-webhook.script.js
index 72e2563cbe..41facc8aeb 100644
--- a/packages/@n8n/benchmark/scenarios/single-webhook/single-webhook.script.ts
+++ b/packages/@n8n/benchmark/scenarios/single-webhook/single-webhook.script.js
@@ -5,6 +5,13 @@ const apiBaseUrl = __ENV.API_BASE_URL;
 
 export default function () {
 	const res = http.get(`${apiBaseUrl}/webhook/single-webhook`);
+
+	if (res.status !== 200) {
+		console.error(
+			`Invalid response. Received status ${res.status}. Body: ${JSON.stringify(res.body)}`,
+		);
+	}
+
 	check(res, {
 		'is status 200': (r) => r.status === 200,
 	});
diff --git a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml
index ca3ad9c23d..c686f581b3 100644
--- a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml
+++ b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml
@@ -176,7 +176,7 @@ services:
 
   # Load balancer that acts as an entry point for n8n
   n8n:
-    image: nginx:latest
+    image: nginx:1.27.2
     ports:
       - '5678:80'
     volumes:
diff --git a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/nginx.conf b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/nginx.conf
index 86100f8c50..142da7416e 100644
--- a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/nginx.conf
+++ b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/nginx.conf
@@ -3,6 +3,7 @@ events {}
 http {
 		client_max_body_size 50M;
 		access_log off;
+		error_log /dev/stderr warn;
 
     upstream backend {
         server n8n_main1:5678;
diff --git a/packages/@n8n/benchmark/scripts/run-in-cloud.mjs b/packages/@n8n/benchmark/scripts/run-in-cloud.mjs
index c61c0901d4..35e90bdee5 100755
--- a/packages/@n8n/benchmark/scripts/run-in-cloud.mjs
+++ b/packages/@n8n/benchmark/scripts/run-in-cloud.mjs
@@ -78,12 +78,6 @@ async function runBenchmarksOnVm(config, benchmarkEnv) {
 	const bootstrapScriptPath = path.join(scriptsDir, 'bootstrap.sh');
 	await sshClient.ssh(`chmod a+x ${bootstrapScriptPath} && ${bootstrapScriptPath}`);
 
-	// Benchmarking the VM
-	const vmBenchmarkScriptPath = path.join(scriptsDir, 'vm-benchmark.sh');
-	await sshClient.ssh(`chmod a+x ${vmBenchmarkScriptPath} && ${vmBenchmarkScriptPath}`, {
-		verbose: true,
-	});
-
 	// Give some time for the VM to be ready
 	await sleep(1000);
 
diff --git a/packages/@n8n/benchmark/scripts/vm-benchmark.sh b/packages/@n8n/benchmark/scripts/vm-benchmark.sh
deleted file mode 100644
index 13b7eb2b1a..0000000000
--- a/packages/@n8n/benchmark/scripts/vm-benchmark.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Install fio
-DEBIAN_FRONTEND=noninteractive sudo apt-get -y install fio > /dev/null
-
-# Run the disk benchmark
-fio --name=rand_rw --ioengine=libaio --rw=randrw --rwmixread=70 --bs=4k --numjobs=4 --size=1G --runtime=30 --directory=/n8n --group_reporting
-
-# Remove files
-sudo rm /n8n/rand_rw.*
-
-# Uninstall fio
-DEBIAN_FRONTEND=noninteractive sudo apt-get -y remove fio > /dev/null