Skip to content
Snippets Groups Projects
Commit 3de90cf5 authored by Roman Tsisyk's avatar Roman Tsisyk
Browse files

Fix assertion on invalid replication_source in box.cfg()

Fixes #1962
parent 6b71e064
No related branches found
No related tags found
No related merge requests found
...@@ -359,6 +359,7 @@ box_set_replication_source(void) ...@@ -359,6 +359,7 @@ box_set_replication_source(void)
return; return;
} }
box_check_replication_source();
box_sync_replication_source(); box_sync_replication_source();
/* Start all replicas from the cluster registry */ /* Start all replicas from the cluster registry */
......
TAP version 13 TAP version 13
1..46 1..47
ok - box is not started ok - box is not started
ok - invalid slab_alloc_minimal ok - invalid slab_alloc_minimal
ok - invalid slab_alloc_minimal ok - invalid slab_alloc_minimal
...@@ -46,3 +46,4 @@ ok - dynamic listen ...@@ -46,3 +46,4 @@ ok - dynamic listen
ok - dynamic listen ok - dynamic listen
ok - reuse unix socket ok - reuse unix socket
ok - delete socket at exit ok - delete socket at exit
ok - invalid replication_source
...@@ -4,7 +4,7 @@ local tap = require('tap') ...@@ -4,7 +4,7 @@ local tap = require('tap')
local test = tap.test('cfg') local test = tap.test('cfg')
local socket = require('socket') local socket = require('socket')
local fio = require('fio') local fio = require('fio')
test:plan(46) test:plan(47)
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
-- Invalid values -- Invalid values
...@@ -191,5 +191,11 @@ code = " box.cfg{ listen='unix/:'" .. path .. "' } " ...@@ -191,5 +191,11 @@ code = " box.cfg{ listen='unix/:'" .. path .. "' } "
run_script(code) run_script(code)
test:isnil(fio.stat(path), "delete socket at exit") test:isnil(fio.stat(path), "delete socket at exit")
--
-- gh-1962: incorrect replication source
--
status, reason = pcall(box.cfg, {replication_source="3303,3304"})
test:ok(not status and reason:match("Incorrect"), "invalid replication_source")
test:check() test:check()
os.exit(0) os.exit(0)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment