From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Fri, 30 Mar 2018 14:17:34 +0300 From: Vladimir Davydov Subject: Re: [tarantool-patches] [PATCH 1/2] [replication] [recovery] recover missing data Message-ID: <20180330111734.aoqaliydqbnb76ax@esperanza> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: To: Konstantin Belyavskiy Cc: tarantool-patches@freelists.org List-ID: The subject line doesn't conform to our guidelines. Please fix. There's no version tag in the subject prefix. Change log is missing (should be in the cover letter in this case). On Thu, Mar 29, 2018 at 07:15:15PM +0300, Konstantin Belyavskiy wrote: > Part 1 of 2. Please remove this. > Add vclock comparison as a new synchronization condition. > And update catch test as now it works as expected. The comment is awful. Please improve. > > Closes #3210 This patch doesn't close the issue, but it's needed for it so you should use "Needed for" instead of "Closes". > --- > branch: gh-3210-recover-missing-local-data-master-master The branch should be given as a hyperlink to GitHub. Also, a hyperlink to the GitHub issue you're fixing should be here as well. Please read the guidelines carefully and follow them to the letter, as others already do: https://tarantool.io/en/doc/1.9/dev_guide/developer_guidelines.html#how-to-write-a-commit-message https://tarantool.io/en/doc/1.9/dev_guide/developer_guidelines.html#how-to-submit-a-patch-for-review > diff --git a/test/replication/catch.result b/test/replication/catch.result > index 7d61ad26f..05c1c243e 100644 > --- a/test/replication/catch.result > +++ b/test/replication/catch.result > @@ -99,10 +99,11 @@ box.space.test ~= nil > ... > d = box.space.test:delete{1} > --- > +- error: Can't modify data because this instance is in read-only mode. > ... > box.space.test:get(1) == nil > --- > -- true > +- false > ... > -- case #2: delete tuple by net.box > test_run:cmd("switch default") > @@ -118,7 +119,7 @@ c = net_box.connect(r_uri) > ... > c.space.test:get(1) == nil > --- > -- true > +- false > ... > -- check sync > errinj.set("ERRINJ_RELAY_TIMEOUT", 0) >From replication/catch.test.lua: > -- case #2: delete tuple by net.box > > test_run:cmd("switch default") > test_run:cmd("set variable r_uri to 'replica.listen'") > c = net_box.connect(r_uri) > c.space.test:get(1) == nil But the 'delete' command mentioned in the comment is missing. It was removed by commit 73cbb4a6368a7c5bb3e0176a5d7f8b25bbce3493 Author: Ilya Date: Thu Mar 30 14:08:18 2017 +0300 Fix buggy replication/catch.test.lua Fixes #2092 which was obviously wrong (the author didn't even care to fix the comment). Now, we can resurrect the missing 'delete' command. Actually, we can revert all changes done by this commit altogether. Please do. Also, now the test takes too long to complete (> 4 seconds). This happens, because the replica disconnects from the master by timeout, which is set to 4 times box.cfg.replication_timeout. Please use replica_timeout.lua instead of replica.lua to speed up the test execution time.