From 99faa810a0c3a490daf12985cdf04aea29cc0460 Mon Sep 17 00:00:00 2001 From: psergee Date: Tue, 12 Dec 2023 12:25:30 +0300 Subject: [PATCH] test: fix setup with master vshard Since commit [1], it is forbidden to call box.cfg as a part of vshard.router.cfg: it is expected that user will separate their setups. This patch should satisfy both older and newer vshard versions. 1. https://github.com/tarantool/vshard/commit/bc1c3c46ee474640ff1fe7dceacda45f7290c368 --- test/integration/running/cluster_crud_app/localcfg.lua | 2 +- test/integration/running/cluster_crud_app/router.lua | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/test/integration/running/cluster_crud_app/localcfg.lua b/test/integration/running/cluster_crud_app/localcfg.lua index 59e7cd5dd..2e72ae7df 100644 --- a/test/integration/running/cluster_crud_app/localcfg.lua +++ b/test/integration/running/cluster_crud_app/localcfg.lua @@ -19,5 +19,5 @@ return { }, }, -- replicaset #2 }, -- sharding - replication_connect_quorum = 0, + discovery_mode = 'off', } diff --git a/test/integration/running/cluster_crud_app/router.lua b/test/integration/running/cluster_crud_app/router.lua index b31702bfd..633f8ffdb 100755 --- a/test/integration/running/cluster_crud_app/router.lua +++ b/test/integration/running/cluster_crud_app/router.lua @@ -1,10 +1,14 @@ -- This is a router listening network socket. -local cfg = require('localcfg') -cfg.discovery_mode = 'off' +local vshard = require('vshard') -- Start the database with sharding -local vshard = require('vshard') +box.cfg{ + listen = 3300, + replication_connect_quorum = 0, +} + +local cfg = require('localcfg') vshard.router.cfg(cfg) vshard.router.bootstrap()