From 11406a37629ddf038254b2d0e138273b4c36dd71 Mon Sep 17 00:00:00 2001
From: "ms.evilhat" <ms.evilhat@gmail.com>
Date: Wed, 5 Apr 2023 12:37:46 +0300
Subject: [PATCH] feat: add host arg to k6 script and set default value to
localhost
---
sbroad-cartridge/stress-test/groupby/k6.js | 9 +++++++--
sbroad-cartridge/stress-test/insert/k6.js | 13 +++++++++----
sbroad-cartridge/stress-test/projection/k6.js | 9 +++++++--
sbroad-cartridge/stress-test/projection_wide/k6.js | 13 +++++++++----
4 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/sbroad-cartridge/stress-test/groupby/k6.js b/sbroad-cartridge/stress-test/groupby/k6.js
index 8c02b0c566..0b5a01cbcb 100644
--- a/sbroad-cartridge/stress-test/groupby/k6.js
+++ b/sbroad-cartridge/stress-test/groupby/k6.js
@@ -1,11 +1,16 @@
import tarantool from "k6/x/tarantool";
import { updateSuccessRate } from '../metrics.js';
+let host = "localhost";
+if (__ENV.HOST) {
+ host = __ENV.HOST;
+}
+
const clients = [
- tarantool.connect(["localhost:3301"], {"user": "admin", pass: "app-cluster-cookie"}),
+ tarantool.connect([host + ":3301"], {"user": "admin", pass: "app-cluster-cookie"}),
]
-const pattern = `SELECT "a0"+"a1"+"a2", "a1", "a1"+"a2", "a3", "a4", "a5" + "a1", "a1"+"a6", "a7"*"a9", "a8", "a9"
+const pattern = `SELECT "a0"+"a1"+"a2", "a1", "a1"+"a2", "a3", "a4", "a5" + "a1", "a1"+"a6", "a7"*"a9", "a8", "a9"
FROM "t"
GROUP BY "a1", "a3", "a4", "a0"+"a1"+"a2", "a5" + "a1", "a1"+"a2", "a8", "a9", "a1"+"a6", "a7"*"a9"
`
diff --git a/sbroad-cartridge/stress-test/insert/k6.js b/sbroad-cartridge/stress-test/insert/k6.js
index ca86161496..045f91daa4 100644
--- a/sbroad-cartridge/stress-test/insert/k6.js
+++ b/sbroad-cartridge/stress-test/insert/k6.js
@@ -2,11 +2,16 @@ import tarantool from "k6/x/tarantool";
import {uuidv4} from 'https://jslib.k6.io/k6-utils/1.1.0/index.js';
import { updateSuccessRate } from '../metrics.js';
+let host = "localhost";
+if (__ENV.HOST) {
+ host = __ENV.HOST;
+}
+
const clients = [
- tarantool.connect(["localhost:3301"], {"user": "admin", pass: "app-cluster-cookie"}),
- tarantool.connect(["localhost:3306"], {"user": "admin", pass: "app-cluster-cookie"}),
- tarantool.connect(["localhost:3307"], {"user": "admin", pass: "app-cluster-cookie"}),
- tarantool.connect(["localhost:3308"], {"user": "admin", pass: "app-cluster-cookie"})
+ tarantool.connect([host + ":3301"], {"user": "admin", pass: "app-cluster-cookie"}),
+ tarantool.connect([host + ":3306"], {"user": "admin", pass: "app-cluster-cookie"}),
+ tarantool.connect([host + ":3307"], {"user": "admin", pass: "app-cluster-cookie"}),
+ tarantool.connect([host + ":3308"], {"user": "admin", pass: "app-cluster-cookie"})
]
export let current_server = 0
diff --git a/sbroad-cartridge/stress-test/projection/k6.js b/sbroad-cartridge/stress-test/projection/k6.js
index e9c8ba9aa7..a952bba5ef 100644
--- a/sbroad-cartridge/stress-test/projection/k6.js
+++ b/sbroad-cartridge/stress-test/projection/k6.js
@@ -2,7 +2,12 @@ import tarantool from "k6/x/tarantool";
import {randomItem} from 'https://jslib.k6.io/k6-utils/1.1.0/index.js';
import { updateSuccessRate } from '../metrics.js';
-const client = tarantool.connect(["localhost:3301"], {"user": "admin", pass: "app-cluster-cookie"})
+let host = "localhost";
+if (__ENV.HOST) {
+ host = __ENV.HOST;
+}
+
+const client = tarantool.connect([host + ":3301"], {"user": "admin", pass: "app-cluster-cookie"})
let ids = Array.from(
{
@@ -26,4 +31,4 @@ let pattern = `SELECT *
export default () => {
var resp = tarantool.call(client, "sbroad.execute", [pattern, [randomItem(ids)]]);
updateSuccessRate(resp);
-}
\ No newline at end of file
+}
diff --git a/sbroad-cartridge/stress-test/projection_wide/k6.js b/sbroad-cartridge/stress-test/projection_wide/k6.js
index e7c63a7cd7..0c870e1774 100644
--- a/sbroad-cartridge/stress-test/projection_wide/k6.js
+++ b/sbroad-cartridge/stress-test/projection_wide/k6.js
@@ -2,11 +2,16 @@ import tarantool from "k6/x/tarantool";
import {randomItem} from 'https://jslib.k6.io/k6-utils/1.1.0/index.js';
import { updateSuccessRate } from '../metrics.js';
+let host = "localhost";
+if (__ENV.HOST) {
+ host = __ENV.HOST;
+}
+
const clients = [
- tarantool.connect(["localhost:3301"], {"user": "admin", pass: "app-cluster-cookie"}),
- tarantool.connect(["localhost:3306"], {"user": "admin", pass: "app-cluster-cookie"}),
- tarantool.connect(["localhost:3307"], {"user": "admin", pass: "app-cluster-cookie"}),
- tarantool.connect(["localhost:3308"], {"user": "admin", pass: "app-cluster-cookie"})
+ tarantool.connect([host + ":3301"], {"user": "admin", pass: "app-cluster-cookie"}),
+ tarantool.connect([host + ":3306"], {"user": "admin", pass: "app-cluster-cookie"}),
+ tarantool.connect([host + ":3307"], {"user": "admin", pass: "app-cluster-cookie"}),
+ tarantool.connect([host + ":3308"], {"user": "admin", pass: "app-cluster-cookie"})
]
export let current_server = 0
--
GitLab