[tarantool-patches] [PATCH] box: fix assertion with duplication in repl. source
Olga Arkhangelskaia
krishtal.olja at gmail.com
Tue Aug 28 19:22:26 MSK 2018
When we try to connect one master more than once we used to have
assertion instead of error.
Closes #3610
---
https://github.com/tarantool/tarantool/issues/3610
https://github.com/tarantool/tarantool/tree/OKriw/assert_fail_when_connect_master_twice
src/box/box.cc | 14 ++++++++++++++
test/box-tap/cfg.test.lua | 8 +++++++-
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/src/box/box.cc b/src/box/box.cc
index 8d7454d1f..3a571ae3c 100644
--- a/src/box/box.cc
+++ b/src/box/box.cc
@@ -369,9 +369,23 @@ static void
box_check_replication(void)
{
int count = cfg_getarr_size("replication");
+ char *repl[count-1];
for (int i = 0; i < count; i++) {
const char *source = cfg_getarr_elem("replication", i);
box_check_uri(source, "replication");
+ repl[i] = strdup(source);
+ if (repl[i] == NULL) {
+ tnt_raise(OutOfMemory, sizeof(*source), "source", "malloc");
+ }
+ for (int j = i; j >= 1; j--) {
+ if (strcmp(repl[i], repl[j-1]) == 0) {
+ tnt_raise(ClientError, ER_CFG, "replication",
+ "duplication of replication source");
+ }
+ }
+ }
+ for (int i = 0; i < count; i++) {
+ free(repl[i]);
}
}
diff --git a/test/box-tap/cfg.test.lua b/test/box-tap/cfg.test.lua
index 5e72004ca..b227c5edb 100755
--- a/test/box-tap/cfg.test.lua
+++ b/test/box-tap/cfg.test.lua
@@ -6,7 +6,7 @@ local socket = require('socket')
local fio = require('fio')
local uuid = require('uuid')
local msgpack = require('msgpack')
-test:plan(90)
+test:plan(91)
--------------------------------------------------------------------------------
-- Invalid values
@@ -446,5 +446,11 @@ code = string.format(code_fmt, dir, instance_uuid, uuid.new())
test:is(run_script(code), PANIC, "replicaset_uuid mismatch")
fio.rmdir(dir)
+--
+--gh-3610: assertion failure when trying to connect to the same master more than once
+--
+status, reason = pcall(box.cfg, {listen = 3303, replication={3303,3303}})
+test:ok(not status and reason:match("Incorrect"), "Duplication of replication source")
+
test:check()
os.exit(0)
--
2.14.3 (Apple Git-98)
More information about the Tarantool-patches
mailing list