Skip to content

Commit 99faa81

Browse files
committed
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. tarantool/vshard@bc1c3c4
1 parent eaccb11 commit 99faa81

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

test/integration/running/cluster_crud_app/localcfg.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ return {
1919
},
2020
}, -- replicaset #2
2121
}, -- sharding
22-
replication_connect_quorum = 0,
22+
discovery_mode = 'off',
2323
}

test/integration/running/cluster_crud_app/router.lua

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
-- This is a router listening network socket.
22

3-
local cfg = require('localcfg')
4-
cfg.discovery_mode = 'off'
3+
local vshard = require('vshard')
54

65
-- Start the database with sharding
7-
local vshard = require('vshard')
6+
box.cfg{
7+
listen = 3300,
8+
replication_connect_quorum = 0,
9+
}
10+
11+
local cfg = require('localcfg')
812
vshard.router.cfg(cfg)
913
vshard.router.bootstrap()
1014

0 commit comments

Comments
 (0)