From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id CD67E6EC40; Mon, 9 Aug 2021 16:04:31 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org CD67E6EC40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1628514271; bh=vaYJ4RP17utqLLNrNAlVpn0LI3s33KLDw5on6qPO+Gs=; h=In-Reply-To:Date:References:To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=JBw3etvypdNThgpyfDmcFssSgz2rsFSruj1XypbUnVR8zeFzD4hxkyflnhjeigrdw t86YbS1U1IyQAxSW7o/OeVY0FH56qJap6X/H66w648sygtR/l8A2r7SGInMsgFEPYb PFBY43CqcyL6+0TxUZPfnlM4iF1XB5ZCYGH8XRnE= Received: from smtp44.i.mail.ru (smtp44.i.mail.ru [94.100.177.104]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id C26CD6EC40 for ; Mon, 9 Aug 2021 16:04:29 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C26CD6EC40 Received: by smtp44.i.mail.ru with esmtpa (envelope-from ) id 1mD4xB-0000rH-1L; Mon, 09 Aug 2021 16:04:29 +0300 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.100.0.2.22\)) In-Reply-To: <20210809100931.14367-1-ya.shtunder@gmail.com> Date: Mon, 9 Aug 2021 16:04:27 +0300 Content-Transfer-Encoding: quoted-printable Message-Id: <7F04672A-9416-4445-AC8A-96EC8457DF5C@tarantool.org> References: <20210809100931.14367-1-ya.shtunder@gmail.com> To: Yan Shtunder X-Mailer: Apple Mail (2.3654.100.0.2.22) X-7564579A: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD92087353F0EC44DD9ECFD080E047A606F56291F8739A291D6182A05F5380850403E002189CB080031D32E7287EDDDE04CB3A9134F570F1C937DE2880F77224CA6 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE711E5B611353E2625EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063770F3384661E7DC4D8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D838D217C3BB22F1E9F1866F06495BE8F3117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8BF1175FABE1C0F9B6A471835C12D1D977C4224003CC8364762BB6847A3DEAEFB0F43C7A68FF6260569E8FC8737B5C2249EC8D19AE6D49635B68655334FD4449CB9ECD01F8117BC8BEAAAE862A0553A39223F8577A6DFFEA7C837C4FEFBD186071C4224003CC83647689D4C264860C145E X-C1DE0DAB: 0D63561A33F958A56F12D691571F56FABA259B9A7EA728F9042D3654C38D9FF9D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA759F66ED85EB5F25FD410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3454E98140CCACB5B35ACC72F7742D8188CD119E84F63EB332C6983C62ACCDD659166EDE18CB95826F1D7E09C32AA3244C4E5DCC4F6ABB57D4DEB3F6112CE7BDE424AF4FAF06DA24FDFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojGhQhWEp1aB+WtloulMu1hQ== X-Mailru-Sender: 3B9A0136629DC912F4AABCEFC589C81EA77955A7D0EADBA1F635C2EBC00F43873893FEE2500F6304AD07DD1419AC565FA614486B47F28B67C5E079CCF3B0523AED31B7EB2E253A9E112434F685709FCF0DA7A0AF5A3A8387 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH] replication: fill replicaset.applier.vclock after local recovery X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Sergey Ostanevich via Tarantool-patches Reply-To: Sergey Ostanevich Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi! Thanks for the patch! Just some minor updates to the message. LGTM with changes applied. Regards, Sergos > On 9 Aug 2021, at 13:09, Yan Shtunder wrote: >=20 > replicaset.applier.vclock is initialized in replication_init(), > which happens before local recovery. If some changes are come > frome some instance via applier that applier.vclock will equal 0. ^^^ ^^^ ^^^^^ ^^^^ ^^ from an replication the be > This means that if some wild master send this node already applied ^ will > data, the node will apply the same data twice. >=20 > Closes #6028 > --- > Issue: https://github.com/tarantool/tarantool/issues/6028 > Patch: = https://github.com/tarantool/tarantool/tree/yshtunder/gh-6028-applier-vclo= ck >=20 > src/box/applier.cc | 5 ++ > src/box/box.cc | 7 +++ > src/lib/core/errinj.h | 1 + > test/box/errinj.result | 1 + > test/replication/gh-6028-replica.lua | 13 ++++ > .../gh-6028-vclock-is-empty.result | 60 +++++++++++++++++++ > .../gh-6028-vclock-is-empty.test.lua | 24 ++++++++ > 7 files changed, 111 insertions(+) > create mode 100644 test/replication/gh-6028-replica.lua > create mode 100644 test/replication/gh-6028-vclock-is-empty.result > create mode 100644 test/replication/gh-6028-vclock-is-empty.test.lua >=20 > diff --git a/src/box/applier.cc b/src/box/applier.cc > index 07fe7f5c7..9855b8d37 100644 > --- a/src/box/applier.cc > +++ b/src/box/applier.cc > @@ -1230,6 +1230,11 @@ applier_subscribe(struct applier *applier) > struct vclock vclock; > vclock_create(&vclock); > vclock_copy(&vclock, &replicaset.vclock); > + > + ERROR_INJECT(ERRINJ_REPLICASET_VCLOCK, { > + vclock_create(&vclock); > + }); > + > /* > * Stop accepting local rows coming from a remote > * instance as soon as local WAL starts accepting writes. > diff --git a/src/box/box.cc b/src/box/box.cc > index ab7d983c9..f5cd63c9e 100644 > --- a/src/box/box.cc > +++ b/src/box/box.cc > @@ -3451,6 +3451,13 @@ box_cfg_xc(void) > bootstrap(&instance_uuid, &replicaset_uuid, > &is_bootstrap_leader); > } > + > + /* > + * replicaset.applier.vclock is filled with real > + * value where local restore has already completed =09 > + */ > + vclock_copy(&replicaset.applier.vclock, &replicaset.vclock); > + > fiber_gc(); >=20 > /* > diff --git a/src/lib/core/errinj.h b/src/lib/core/errinj.h > index 359174b16..fcd856fbb 100644 > --- a/src/lib/core/errinj.h > +++ b/src/lib/core/errinj.h > @@ -152,6 +152,7 @@ struct errinj { > _(ERRINJ_STDIN_ISATTY, ERRINJ_INT, {.iparam =3D -1}) \ > _(ERRINJ_SNAP_COMMIT_FAIL, ERRINJ_BOOL, {.bparam =3D false}) \ > _(ERRINJ_IPROTO_SINGLE_THREAD_STAT, ERRINJ_INT, {.iparam =3D = -1}) \ > + _(ERRINJ_REPLICASET_VCLOCK, ERRINJ_BOOL, {.bparam =3D false}) \ >=20 > ENUM0(errinj_id, ERRINJ_LIST); > extern struct errinj errinjs[]; > diff --git a/test/box/errinj.result b/test/box/errinj.result > index 43daf5f0f..62e37bbdd 100644 > --- a/test/box/errinj.result > +++ b/test/box/errinj.result > @@ -70,6 +70,7 @@ evals > - ERRINJ_RELAY_REPORT_INTERVAL: 0 > - ERRINJ_RELAY_SEND_DELAY: false > - ERRINJ_RELAY_TIMEOUT: 0 > + - ERRINJ_REPLICASET_VCLOCK: false > - ERRINJ_REPLICA_JOIN_DELAY: false > - ERRINJ_SIO_READ_MAX: -1 > - ERRINJ_SNAP_COMMIT_DELAY: false > diff --git a/test/replication/gh-6028-replica.lua = b/test/replication/gh-6028-replica.lua > new file mode 100644 > index 000000000..5669cc4e9 > --- /dev/null > +++ b/test/replication/gh-6028-replica.lua > @@ -0,0 +1,13 @@ > +#!/usr/bin/env tarantool > + > +require('console').listen(os.getenv('ADMIN')) > + > +box.error.injection.set("ERRINJ_REPLICASET_VCLOCK", true) > + > +box.cfg({ > + listen =3D os.getenv("LISTEN"), > + replication =3D {os.getenv("MASTER"), = os.getenv("LISTEN")}, > + memtx_memory =3D 107374182, > +}) > + > +box.error.injection.set("ERRINJ_REPLICASET_VCLOCK", false) > diff --git a/test/replication/gh-6028-vclock-is-empty.result = b/test/replication/gh-6028-vclock-is-empty.result > new file mode 100644 > index 000000000..0b103bb6e > --- /dev/null > +++ b/test/replication/gh-6028-vclock-is-empty.result > @@ -0,0 +1,60 @@ > +-- test-run result file version 2 > +test_run =3D require('test_run').new() > + | --- > + | ... > + > +box.schema.user.grant('guest', 'replication') > + | --- > + | ... > +s =3D box.schema.create_space('test') > + | --- > + | ... > +_ =3D s:create_index('pk') > + | --- > + | ... > + > + > +-- Case 1 > +test_run:cmd('create server replica with rpl_master=3Ddefault,\ > + script=3D"replication/gh-6028-replica.lua"') > + | --- > + | - true > + | ... > +test_run:cmd('start server replica') > + | --- > + | - true > + | ... > + > +test_run:cmd('stop server replica') > + | --- > + | - true > + | ... > +s:insert{1} > + | --- > + | - [1] > + | ... > + > + > +-- Case 2 > +test_run:cmd('start server replica') > + | --- > + | - true > + | ... > +s:insert{2} > + | --- > + | - [2] > + | ... > + > + > +test_run:cmd('stop server replica') > + | --- > + | - true > + | ... > +test_run:cmd('cleanup server replica') > + | --- > + | - true > + | ... > +test_run:cmd('delete server replica') > + | --- > + | - true > + | ... > diff --git a/test/replication/gh-6028-vclock-is-empty.test.lua = b/test/replication/gh-6028-vclock-is-empty.test.lua > new file mode 100644 > index 000000000..ba14eca55 > --- /dev/null > +++ b/test/replication/gh-6028-vclock-is-empty.test.lua > @@ -0,0 +1,24 @@ > +test_run =3D require('test_run').new() > + > +box.schema.user.grant('guest', 'replication') > +s =3D box.schema.create_space('test') > +_ =3D s:create_index('pk') > + > + > +-- Case 1 > +test_run:cmd('create server replica with rpl_master=3Ddefault,\ > + script=3D"replication/gh-6028-replica.lua"') > +test_run:cmd('start server replica') > + > +test_run:cmd('stop server replica') > +s:insert{1} > + > + > +-- Case 2 > +test_run:cmd('start server replica') > +s:insert{2} > + > + > +test_run:cmd('stop server replica') > +test_run:cmd('cleanup server replica') > +test_run:cmd('delete server replica') > -- > 2.25.1 >=20