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 CD4246EC40; Tue, 29 Jun 2021 01:19:39 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org CD4246EC40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1624918779; bh=tuYEQJ3Ehn2afklx6mVhwDEVZgdsjLutpNIejwSS89o=; 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=e9DmLssq1u8BxJ1MWV/smL+1X7JUwn0QBV0nowbsZlLuyrLCXKQwm0v3MKG7LF3Gz UHr+X4v1jnto9QAupARsRNKeiylZIMqk28oCxQO88hcTRA6cDtjazo/0YyKmbuxpJW f0sbPPv86yLELSHQg/S1KXfhk5LBj5+SUj7tU41Q= Received: from smtp61.i.mail.ru (smtp61.i.mail.ru [217.69.128.41]) (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 E3FAC6F3C8 for ; Tue, 29 Jun 2021 01:13:28 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org E3FAC6F3C8 Received: by smtp61.i.mail.ru with esmtpa (envelope-from ) id 1lxzVQ-0007oC-4C; Tue, 29 Jun 2021 01:13:28 +0300 To: v.shpilevoy@tarantool.org, gorcunov@gmail.com Date: Tue, 29 Jun 2021 01:12:58 +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: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD954DFF1DC42D673FB4F75AC5594ACDC16869A51A860A12816182A05F538085040BCCE89BAC67D1BBFC7EAD648DD6ACC22096480D6AEF959232A04E2E74EBFA0B3 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE788A2BECDB7201542EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637E8F1A1743CF948808638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8FEA3654D93882DB83F411F05146EB954117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF77088377309FF52A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F4460429728776938767073520B28585415E75ADA92CC0D3CB04F14752D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B60A62CEF541B197C8089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2AD77751E876CB595E8F7B195E1C97831D7A3F10BEE0A642D05D977CDE1DB6210 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CD87436A60A035F4036EAE629EE263ED9C9DE986601D2BC869C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF92B0BE0DA6BB795D699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34AA8975497C7004E8242E4458AC93DA8AD1DC25FC87457BC174074F4B72FA63A5F58A9C06C491F21A1D7E09C32AA3244CDBBA91CF15C028DF6FFEC590C8BF9CC995A9E0DC41E9A4CF927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojNjLyMoNI2Jb4n0CdZhJ4Cg== X-Mailru-Sender: 3B9A0136629DC9125D61937A2360A446C3FEE19542AA4C0E8C2A268EFF71FE26CDAE8496DC6A1D92424AE0EB1F3D1D21E2978F233C3FAE6EE63DB1732555E4A8EE80603BA4A5B0BC112434F685709FCF0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v3 12/12] replication: send current Raft term in join response 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 nodes send out their latest persisted term to joining replicas. Follow-up #6034 --- src/box/applier.cc | 5 +++++ src/box/relay.cc | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/src/box/applier.cc b/src/box/applier.cc index 482b9446a..978383e64 100644 --- a/src/box/applier.cc +++ b/src/box/applier.cc @@ -459,6 +459,11 @@ applier_wait_snapshot(struct applier *applier) if (xrow_decode_synchro(&row, &req) != 0) diag_raise(); txn_limbo_process(&txn_limbo, &req); + } else if (iproto_type_is_raft_request(row.type)) { + struct raft_request req; + if (xrow_decode_raft(&row, &req, NULL) != 0) + diag_raise(); + box_raft_recover(&req); } else if (row.type != IPROTO_JOIN_SNAPSHOT) { tnt_raise(ClientError, ER_UNKNOWN_REQUEST_TYPE, (uint32_t)row.type); diff --git a/src/box/relay.cc b/src/box/relay.cc index 4b102a777..70f1a045b 100644 --- a/src/box/relay.cc +++ b/src/box/relay.cc @@ -428,7 +428,9 @@ relay_initial_join(int fd, uint64_t sync, struct vclock *vclock, diag_raise(); struct synchro_request req; + struct raft_request raft_req; txn_limbo_checkpoint(&txn_limbo, &req); + box_raft_checkpoint_local(&raft_req); /* Respond to the JOIN request with the current vclock. */ struct xrow_header row; @@ -451,6 +453,10 @@ relay_initial_join(int fd, uint64_t sync, struct vclock *vclock, row.sync = sync; coio_write_xrow(&relay->io, &row); + xrow_encode_raft(&row, &fiber()->gc, &raft_req); + row.sync = sync; + coio_write_xrow(&relay->io, &row); + /* Mark the end of the metadata stream. */ row.type = IPROTO_JOIN_SNAPSHOT; coio_write_xrow(&relay->io, &row); -- 2.30.1 (Apple Git-130)