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 CD7916EC5A; Wed, 14 Jul 2021 21:30:55 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org CD7916EC5A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1626287455; bh=04EqxkILELC1ZaDGWzd9wgKS4ZHxAPcVMYN7ZpJkDZo=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=SG7mBJObpqsSyQhTN925iRBVeJ1794HPpGE9d+NQarJioVUSbxcLZJ755jUiGvmjB 84Y3Yv9tT2Oky6ibQ8x6w1Tm+VHej8qundYq87z8iu+TI77Z2DvDHY+Ejj0ACypIeL +ZVWOPxt9w9jUa1YIoBlvlQXjim2yhLGHxu3+bI4= Received: from smtp58.i.mail.ru (smtp58.i.mail.ru [217.69.128.38]) (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 D823E6F3C9 for ; Wed, 14 Jul 2021 21:26:07 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D823E6F3C9 Received: by smtp58.i.mail.ru with esmtpa (envelope-from ) id 1m3jaB-0007Q7-0S; Wed, 14 Jul 2021 21:26:07 +0300 To: v.shpilevoy@tarantool.org, gorcunov@gmail.com Date: Wed, 14 Jul 2021 21:25:38 +0300 Message-Id: X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD97BB0EF39AD2B33D5CFD6F66580F08A9E8DA110284E1A7113182A05F538085040AEB5FD82E4EB71026C931E76DD19B087ED39FBCD93237EE503227BFAA76E8199 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7E5895F94C5021202EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063795DC1BB912715AE68638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D893B2E05C861055818E06F5481B9B7750117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF1175FABE1C0F9B6A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18F04B652EEC242312D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6D635BA3ABDB36C18089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CE68746B1F2AB10C61DF78B49DEC011C0FE876C6660311F1B9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF309DFB797F6729CB699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34C264B329661203DA0949073EA4B1D760B2A17B442523E57DCD61343397BF99021B9CEFEDED8E0CC11D7E09C32AA3244C821413483367680509F8F76E6E00923AFE8DA44ABE2443F7927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojDdSFIg49M1RCnniN+zplfA== X-Mailru-Sender: 3B9A0136629DC9125D61937A2360A446DCF67A6ACA5D040D4C59CE64FBC97E3F3120E6DF4C99E0C9424AE0EB1F3D1D21E2978F233C3FAE6EE63DB1732555E4A8EE80603BA4A5B0BC112434F685709FCF0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v4 10/16] box: make promote always bump the term 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: Serge Petrenko via Tarantool-patches Reply-To: Serge Petrenko Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" When called without elections, promote resulted in multiple PROMOTE entries for the same term. This is not correct, because all the promotions for the same term except the first one would be ignored as already seen. Part-of #6034 --- src/box/box.cc | 20 ++++++++-- src/box/raft.c | 40 +++++++++++++++++++ src/box/raft.h | 4 ++ .../gh-4114-local-space-replication.result | 7 ++-- .../gh-4114-local-space-replication.test.lua | 4 +- .../gh-6034-election-promote-bump-term.result | 21 ++++++++++ ...h-6034-election-promote-bump-term.test.lua | 9 +++++ test/replication/suite.cfg | 1 + 8 files changed, 97 insertions(+), 9 deletions(-) create mode 100644 test/replication/gh-6034-election-promote-bump-term.result create mode 100644 test/replication/gh-6034-election-promote-bump-term.test.lua diff --git a/src/box/box.cc b/src/box/box.cc index 445875f8f..ac6c487e4 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -1581,6 +1581,17 @@ box_check_promote_term_changed(uint64_t promote_term) return 0; } +/** Trigger a new election round but don't wait for its result. */ +static int +box_trigger_elections(void) +{ + uint64_t promote_term = txn_limbo.promote_greatest_term; + raft_new_term(box_raft()); + if (box_raft_wait_term_persisted() < 0) + return -1; + return box_check_promote_term_changed(promote_term); +} + /** Try waiting until limbo is emptied up to given timeout. */ static int box_try_wait_confirm(double timeout) @@ -1731,9 +1742,12 @@ box_promote(void) if (run_elections && box_run_elections() < 0) return -1; - if (try_wait && - box_try_wait_confirm(2 * replication_synchro_timeout) < 0) - return -1; + if (try_wait) { + if (box_try_wait_confirm(2 * replication_synchro_timeout) < 0) + return -1; + if (box_trigger_elections() < 0) + return -1; + } if ((wait_lsn = box_wait_limbo_acked()) < 0) return -1; diff --git a/src/box/raft.c b/src/box/raft.c index 7f787c0c5..b04932cd9 100644 --- a/src/box/raft.c +++ b/src/box/raft.c @@ -354,6 +354,46 @@ box_raft_wait_leader_found(void) return 0; } +struct raft_wait_persisted_data { + struct fiber *waiter; + uint64_t term; +}; + +static int +box_raft_wait_term_persisted_f(struct trigger *trig, void *event) +{ + struct raft *raft = event; + struct raft_wait_persisted_data *data = trig->data; + if (raft->term >= data->term) + fiber_wakeup(data->waiter); + return 0; +} + +int +box_raft_wait_term_persisted(void) +{ + if (box_raft()->term == box_raft()->volatile_term) + return 0; + struct raft_wait_persisted_data data = { + .waiter = fiber(), + .term = box_raft()->volatile_term, + }; + struct trigger trig; + trigger_create(&trig, box_raft_wait_term_persisted_f, &data, NULL); + raft_on_update(box_raft(), &trig); + + do { + fiber_yield(); + } while (box_raft()->term < data.term && !fiber_is_cancelled()); + + trigger_clear(&trig); + if (fiber_is_cancelled()) { + diag_set(FiberIsCancelled); + return -1; + } + return 0; +} + void box_raft_init(void) { diff --git a/src/box/raft.h b/src/box/raft.h index 6b6136510..4c9c7306d 100644 --- a/src/box/raft.h +++ b/src/box/raft.h @@ -101,6 +101,10 @@ box_raft_process(struct raft_request *req, uint32_t source); int box_raft_wait_leader_found(); +/** Block this fiber until the current volatile term is persisted. */ +int +box_raft_wait_term_persisted(void); + void box_raft_init(void); diff --git a/test/replication/gh-4114-local-space-replication.result b/test/replication/gh-4114-local-space-replication.result index 9b63a4b99..e71eb60a8 100644 --- a/test/replication/gh-4114-local-space-replication.result +++ b/test/replication/gh-4114-local-space-replication.result @@ -45,9 +45,8 @@ test_run:cmd('switch replica') | --- | - true | ... -box.info.vclock[0] +a = box.info.vclock[0] or 0 | --- - | - null | ... box.cfg{checkpoint_count=1} | --- @@ -77,9 +76,9 @@ box.space.test:insert{3} | - [3] | ... -box.info.vclock[0] +assert(box.info.vclock[0] == a + 3) | --- - | - 3 + | - true | ... test_run:cmd('switch default') diff --git a/test/replication/gh-4114-local-space-replication.test.lua b/test/replication/gh-4114-local-space-replication.test.lua index c18fb3b10..65fef3bf6 100644 --- a/test/replication/gh-4114-local-space-replication.test.lua +++ b/test/replication/gh-4114-local-space-replication.test.lua @@ -18,7 +18,7 @@ for i = 1,10 do box.space.test:insert{i} end box.info.vclock[0] == a + 10 or box.info.vclock[0] - a test_run:cmd('switch replica') -box.info.vclock[0] +a = box.info.vclock[0] or 0 box.cfg{checkpoint_count=1} box.space.test:select{} box.space.test:insert{1} @@ -27,7 +27,7 @@ box.space.test:insert{2} box.snapshot() box.space.test:insert{3} -box.info.vclock[0] +assert(box.info.vclock[0] == a + 3) test_run:cmd('switch default') diff --git a/test/replication/gh-6034-election-promote-bump-term.result b/test/replication/gh-6034-election-promote-bump-term.result new file mode 100644 index 000000000..8be4e8243 --- /dev/null +++ b/test/replication/gh-6034-election-promote-bump-term.result @@ -0,0 +1,21 @@ +-- test-run result file version 2 +test_run = require('test_run').new() + | --- + | ... + +-- gh-6034: test that every box.ctl.promote() bumps +-- the instance's term. Even when elections are disabled. +box.cfg{election_mode='off'} + | --- + | ... + +term = box.info.election.term + | --- + | ... +box.ctl.promote() + | --- + | ... +assert(box.info.election.term == term + 1) + | --- + | - true + | ... diff --git a/test/replication/gh-6034-election-promote-bump-term.test.lua b/test/replication/gh-6034-election-promote-bump-term.test.lua new file mode 100644 index 000000000..1e814bf5d --- /dev/null +++ b/test/replication/gh-6034-election-promote-bump-term.test.lua @@ -0,0 +1,9 @@ +test_run = require('test_run').new() + +-- gh-6034: test that every box.ctl.promote() bumps +-- the instance's term. Even when elections are disabled. +box.cfg{election_mode='off'} + +term = box.info.election.term +box.ctl.promote() +assert(box.info.election.term == term + 1) diff --git a/test/replication/suite.cfg b/test/replication/suite.cfg index ae146c366..7f9014b22 100644 --- a/test/replication/suite.cfg +++ b/test/replication/suite.cfg @@ -48,6 +48,7 @@ "gh-5613-bootstrap-prefer-booted.test.lua": {}, "gh-6027-applier-error-show.test.lua": {}, "gh-6032-promote-wal-write.test.lua": {}, + "gh-6034-election-promote-bump-term.test.lua": {}, "gh-6057-qsync-confirm-async-no-wal.test.lua": {}, "gh-6094-rs-uuid-mismatch.test.lua": {}, "gh-6127-election-join-new.test.lua": {}, -- 2.30.1 (Apple Git-130)