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 219CA6EC5A; Wed, 14 Jul 2021 21:29:55 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 219CA6EC5A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1626287395; bh=QeICgNsOeXkILEdSDVcWiaFRgF3/Gal75bfO6WoZpmM=; 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=b5NkOE1492+37p6EmY6B195UuxeCBUzINPwX2iM+mAwHbgPP7EoP0RM5cUFZT5i5B QonAtzu+AGEzp/1XgSZ23duq5i8pGl6JxdYWM3iT8n0U5Zv0iZfNgsW4xDzlxYGHZD C+fDCnOz51DmrqB5jo/dAVBPN2iKjIZbGaqijH/8= 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 15F426EC7F for ; Wed, 14 Jul 2021 21:26:05 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 15F426EC7F Received: by smtp58.i.mail.ru with esmtpa (envelope-from ) id 1m3ja8-0007Q7-BJ; Wed, 14 Jul 2021 21:26:04 +0300 To: v.shpilevoy@tarantool.org, gorcunov@gmail.com Date: Wed, 14 Jul 2021 21:25:36 +0300 Message-Id: <570f5671e2dc2cc2c056b7631a37d7a30b6be814.1626287002.git.sergepetrenko@tarantool.org> 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: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD97BB0EF39AD2B33D52D9CC5C87942E9F174CE6222ED5B65F6182A05F5380850408C34B90B8661035B1341C3CD7BD339F501B17FC6FFFF89C64652E87A2671EF5A X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE761F2E2C91B196E27EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006378B49D47CE295E66E8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8845638212AC8EE49F0BC0C6B1C2B9371117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF80095D1E57F4578A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F4460429728776938767073520B28585415E75ADA92CC0D3CB04F14752D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6D635BA3ABDB36C18089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CE68746B1F2AB10C69DBDA49CD7AB9FFCA2D1B85D86171ECF9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF309DFB797F6729CB699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34C02783DDD5A45DEF63C7AFCAFC5A3C96C5620B11C344487AFDDEC83EE687CAA44D90A1835EF7D27F1D7E09C32AA3244C8BCD942039F8F43CFCBC98A4688C0F68B4DF56057A86259F927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojDdSFIg49M1RGCCyjOho9ZQ== X-Mailru-Sender: 3B9A0136629DC9125D61937A2360A446DCF67A6ACA5D040DD9B49B9AF2544092F7AA1921B336379A424AE0EB1F3D1D21E2978F233C3FAE6EE63DB1732555E4A8EE80603BA4A5B0BC112434F685709FCF0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v4 08/16] raft: refactor raft_new_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" Make raft_new_term() always bump the current term, even when Raft is disabled. Part-of #6034 --- src/box/box.cc | 2 +- src/lib/raft/raft.c | 3 +-- test/unit/raft.c | 15 ++++++++++++++- test/unit/raft.result | 3 ++- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/box/box.cc b/src/box/box.cc index 8c695686e..86370514a 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -3513,7 +3513,7 @@ box_cfg_xc(void) if (!is_bootstrap_leader) { replicaset_sync(); - } else { + } else if (raft_is_enabled(box_raft())) { /* * When the cluster is just bootstrapped and this instance is a * leader, it makes no sense to wait for a leader appearance. diff --git a/src/lib/raft/raft.c b/src/lib/raft/raft.c index ef11ef89f..22f38b330 100644 --- a/src/lib/raft/raft.c +++ b/src/lib/raft/raft.c @@ -988,8 +988,7 @@ raft_cfg_vclock(struct raft *raft, const struct vclock *vclock) void raft_new_term(struct raft *raft) { - if (raft->is_enabled) - raft_sm_schedule_new_term(raft, raft->volatile_term + 1); + raft_sm_schedule_new_term(raft, raft->volatile_term + 1); } static void diff --git a/test/unit/raft.c b/test/unit/raft.c index b9bc49b78..9637abf43 100644 --- a/test/unit/raft.c +++ b/test/unit/raft.c @@ -1184,7 +1184,7 @@ raft_test_death_timeout(void) static void raft_test_enable_disable(void) { - raft_start_test(10); + raft_start_test(11); struct raft_node node; raft_node_create(&node); @@ -1276,7 +1276,20 @@ raft_test_enable_disable(void) "{0: 2}" /* Vclock. */ ), "nothing changed"); + /* Disabled node still bumps the term when needed. */ + raft_node_new_term(&node); + + ok(raft_node_check_full_state(&node, + RAFT_STATE_FOLLOWER /* State. */, + 0 /* Leader. */, + 4 /* Term. */, + 0 /* Vote. */, + 4 /* Volatile term. */, + 0 /* Volatile vote. */, + "{0: 3}" /* Vclock. */ + ), "term bump when disabled"); raft_node_destroy(&node); + raft_finish_test(); } diff --git a/test/unit/raft.result b/test/unit/raft.result index f89cd1658..41463db69 100644 --- a/test/unit/raft.result +++ b/test/unit/raft.result @@ -205,7 +205,7 @@ ok 10 - subtests ok 11 - subtests *** raft_test_death_timeout: done *** *** raft_test_enable_disable *** - 1..10 + 1..11 ok 1 - accepted a leader notification ok 2 - leader is seen ok 3 - death timeout passed @@ -216,6 +216,7 @@ ok 11 - subtests ok 8 - became leader ok 9 - resigned from leader state ok 10 - nothing changed + ok 11 - term bump when disabled ok 12 - subtests *** raft_test_enable_disable: done *** *** raft_test_too_long_wal_write *** -- 2.30.1 (Apple Git-130)