From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 3E0CA26677 for ; Mon, 20 Aug 2018 08:36:15 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xq7RfsdwEsr5 for ; Mon, 20 Aug 2018 08:36:15 -0400 (EDT) Received: from smtp39.i.mail.ru (smtp39.i.mail.ru [94.100.177.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 857792646D for ; Mon, 20 Aug 2018 08:36:14 -0400 (EDT) From: Georgy Kirichenko Subject: [tarantool-patches] Re: [PATCH] replication: adds replication sync after cfg. update Date: Mon, 20 Aug 2018 15:36:07 +0300 Message-ID: <2793334.qKECnH0Sko@home.lan> In-Reply-To: <20180816190521.9310-1-krishtal.olja@gmail.com> References: <20180816190521.9310-1-krishtal.olja@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart19551622.jF3V0XgNaz"; micalg="pgp-sha256"; protocol="application/pgp-signature" Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: tarantool-patches@freelists.org Cc: Olga Arkhangelskaia --nextPart19551622.jF3V0XgNaz Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Thanks for the path. It looks like Ok, but your test is failing for me: [001] Test failed! Result content mismatch: [001] --- replication/orphan.result Mon Aug 20 13:51:43 2018 [001] +++ replication/orphan.reject Mon Aug 20 15:32:36 2018 [001] @@ -77,7 +77,7 @@ [001] ... [001] box.info.replication[1].upstream.lag > 1 [001] --- [001] -- false [001] +- true [001] ... [001] test_run:cmd("switch default") [001] --- [001] On Thursday, August 16, 2018 10:05:21 PM MSK Olga Arkhangelskaia wrote: > When replica reconnects to replica set not for the first time, we > suffer from absence of data sync. Such behavior leads to giving away > outdated data. > > Closes #3427 > --- > https://github.com/tarantool/tarantool/issues/3427 > https://github.com/tarantool/tarantool/tree/OKriw/replication_no_sync-1.9 > > src/box/box.cc | 2 + > test/replication/orphan.result | 103 > ++++++++++++++++++++++++++++++++++++ test/replication/orphan.test.lua | > 47 ++++++++++++++++ > test/replication/replica_orphan.lua | 11 ++++ > 4 files changed, 163 insertions(+) > create mode 100644 test/replication/orphan.result > create mode 100644 test/replication/orphan.test.lua > create mode 100644 test/replication/replica_orphan.lua > > diff --git a/src/box/box.cc b/src/box/box.cc > index 8d7454d1f..af8a3ccd9 100644 > --- a/src/box/box.cc > +++ b/src/box/box.cc > @@ -634,6 +634,8 @@ box_set_replication(void) > box_sync_replication(true); > /* Follow replica */ > replicaset_follow(); > + /* Sync replica up to quorum */ > + replicaset_sync(); > } > > void > diff --git a/test/replication/orphan.result b/test/replication/orphan.result > new file mode 100644 > index 000000000..2230d4546 > --- /dev/null > +++ b/test/replication/orphan.result > @@ -0,0 +1,103 @@ > +-- > +-- gh-3427: no sync after configuration update > +-- > +env = require('test_run') > +--- > +... > +test_run = env.new() > +--- > +... > +engine = test_run:get_cfg('engine') > +--- > +... > +box.schema.user.grant('guest', 'read,write,execute', 'universe') > +--- > +... > +box.schema.user.grant('guest', 'replication') > +--- > +... > +test_run:cmd("create server replica with rpl_master=default, > script='replication/replica_orphan.lua'") +--- > +- true > +... > +test_run:cmd("start server replica") > +--- > +- true > +... > +repl = test_run:eval('replica', 'return box.cfg.listen')[1] > +--- > +... > +box.cfg{replication = repl} > +--- > +... > +test_run:cmd("switch replica") > +--- > +- true > +... > +test_run:cmd("switch default") > +--- > +- true > +... > +s = box.schema.space.create('test', {engine = engine}); > +--- > +... > +index = s:create_index('primary') > +--- > +... > +-- change replica configuration > +test_run:cmd("switch replica") > +--- > +- true > +... > +box.cfg{replication={}} > +--- > +... > +test_run:cmd("switch default") > +--- > +- true > +... > +-- insert values on the master while replica is unconfigured > +a = 100000 while a > 0 do a = a-1 box.space.test:insert{a,'A'..a} end > +--- > +... > +test_run:cmd("switch replica") > +--- > +- true > +... > +box.cfg{replication = os.getenv("MASTER")} > +--- > +... > +test_run:cmd("switch default") > +--- > +- true > +... > +test_run:cmd("switch replica") > +--- > +- true > +... > +box.info.replication[1].upstream.lag > 1 > +--- > +- false > +... > +test_run:cmd("switch default") > +--- > +- true > +... > +-- cleanup > +test_run:cmd("stop server replica") > +--- > +- true > +... > +test_run:cmd("cleanup server replica") > +--- > +- true > +... > +box.space.test:drop() > +--- > +... > +box.schema.user.revoke('guest', 'replication') > +--- > +... > +box.schema.user.revoke('guest', 'read,write,execute', 'universe') > +--- > +... > diff --git a/test/replication/orphan.test.lua > b/test/replication/orphan.test.lua new file mode 100644 > index 000000000..25522f5ac > --- /dev/null > +++ b/test/replication/orphan.test.lua > @@ -0,0 +1,47 @@ > +-- > +-- gh-3427: no sync after configuration update > +-- > + > +env = require('test_run') > +test_run = env.new() > +engine = test_run:get_cfg('engine') > + > +box.schema.user.grant('guest', 'read,write,execute', 'universe') > + > +box.schema.user.grant('guest', 'replication') > +test_run:cmd("create server replica with rpl_master=default, > script='replication/replica_orphan.lua'") +test_run:cmd("start server > replica") > + > +repl = test_run:eval('replica', 'return box.cfg.listen')[1] > +box.cfg{replication = repl} > + > +test_run:cmd("switch replica") > +test_run:cmd("switch default") > + > +s = box.schema.space.create('test', {engine = engine}); > +index = s:create_index('primary') > + > +-- change replica configuration > +test_run:cmd("switch replica") > +box.cfg{replication={}} > + > +test_run:cmd("switch default") > +-- insert values on the master while replica is unconfigured > +a = 100000 while a > 0 do a = a-1 box.space.test:insert{a,'A'..a} end > + > +test_run:cmd("switch replica") > +box.cfg{replication = os.getenv("MASTER")} > + > +test_run:cmd("switch default") > +test_run:cmd("switch replica") > + > +box.info.replication[1].upstream.lag > 1 > +test_run:cmd("switch default") > + > +-- cleanup > +test_run:cmd("stop server replica") > +test_run:cmd("cleanup server replica") > +box.space.test:drop() > +box.schema.user.revoke('guest', 'replication') > +box.schema.user.revoke('guest', 'read,write,execute', 'universe') > + > diff --git a/test/replication/replica_orphan.lua > b/test/replication/replica_orphan.lua new file mode 100644 > index 000000000..98573a407 > --- /dev/null > +++ b/test/replication/replica_orphan.lua > @@ -0,0 +1,11 @@ > +#!/usr/bin/env tarantool > + > +local TIMEOUT = tonumber(arg[1]) > + > +box.cfg({ > + listen = os.getenv("LISTEN"), > + replication = os.getenv("MASTER"), > + replication_connect_timeout = 0.5, > +}) > + > +require('console').listen(os.getenv('ADMIN')) --nextPart19551622.jF3V0XgNaz Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEBJFDbU76LsBbgHBsvKOmCX79zb4FAlt6tbcACgkQvKOmCX79 zb7XFAgAvpiIq3KxLgAmWlD3yIO/dVkHTRMVkh12PeXFkRVwIc4cALvH3DaUgsxN LRh2OQUJoMVyy9/RhCVsdsChhkSiv3EpaziW7yVay3vtq7YR3pT5JsPxuTLgV+9/ wUCGaZAPlcWpJftPRDlPGa9ZL8lKWS4cWz5FhEkww90mx9CQZi6bybURSs61zI2q nvyQpnVyBlZUG0y/kXxbOEUdSp0qOWBhXbpVWPL1Hl3k2SGzUtkhM/gG+AgLfH78 x6QkX/0PLqzdZEjBc2TKCWyP4V22lm/+qEL9dJ7gaIyYkkNOIZd4hkEcngA48V6t hDh+T9zrththcsF0T4daElPlLfFF0Q== =qf0L -----END PGP SIGNATURE----- --nextPart19551622.jF3V0XgNaz--