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 D514D6EC58; Mon, 21 Jun 2021 13:13:29 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D514D6EC58 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1624270409; bh=dzk/rtKGXhj38VV4bODgMLMcSAD/K+n5WeM6UA1YGNQ=; h=To:Cc:References:Date:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=k9lsDfOkvjB2skxy752d7smRchWhDKE8Kkm4inj8YBXdr6d/0eJAHg93TRDALPHzh ODRphQK1U0Y829uyQo+REag/ikcbPhy2s1yfzUWwkCmjhPVja81+o8WBiGi1Gznh3e gExUjUBDgxSpJ6D1y8X9/0SfIW3kv9l5qZGMkP8I= Received: from smtp30.i.mail.ru (smtp30.i.mail.ru [94.100.177.90]) (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 D7EC46EC5F for ; Mon, 21 Jun 2021 13:13:03 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D7EC46EC5F Received: by smtp30.i.mail.ru with esmtpa (envelope-from ) id 1lvGvP-0005SO-7a; Mon, 21 Jun 2021 13:13:03 +0300 To: Vladislav Shpilevoy , gorcunov@gmail.com Cc: tarantool-patches@dev.tarantool.org References: <1819defc-9d99-c3f0-41d1-52955c5af02c@tarantool.org> Message-ID: Date: Mon, 21 Jun 2021 13:13:02 +0300 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <1819defc-9d99-c3f0-41d1-52955c5af02c@tarantool.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-GB X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD91C2C07775F13263A7E15E163E5632B0345CA5730AF53AB3C00894C459B0CD1B9A20F8621B379E2930A066B8BAB3095D87BF517ABB5E8AC2E56AF9A33750679FD X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE75BDEF5A3674FD449EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637160171C9EBC7AFE48638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D82E41FCDB2104A6139A9A6CC2182A7715117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC2EE5AD8F952D28FBA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18BDFBBEFFF4125B51D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6753C3A5E0A5AB5B7089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A5289D9D5543F6726A7508375518F2DF704E6E7F98CCFE4D94D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA75448CF9D3A7B2C848410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34AEC7C2AC3C44791DED2F84B771BEE1CDD89A1501850205F4271AFEBBD29548189BBD94BF12E27D7C1D7E09C32AA3244CF6E0D9D9837F71A27EB01B3E93353CC7E3D93501275E802FFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj8x+Gb+jwA+Rx97WOm4F/MQ== X-Mailru-Sender: 3B9A0136629DC9125D61937A2360A4466F5A51994DB4FB8BADF5BE40FF36C73948497B540B0DA2FB424AE0EB1F3D1D21E2978F233C3FAE6EE63DB1732555E4A8EE80603BA4A5B0BC112434F685709FCF0DA7A0AF5A3A8387 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH 2/7] replication: forbid implicit limbo owner transition 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 Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" 19.06.2021 01:49, Vladislav Shpilevoy пишет: > Nice fixes! > > See 3 comments below. > >> diff --git a/src/box/errcode.h b/src/box/errcode.h >> index 49aec4bf6..e3943c01d 100644 >> --- a/src/box/errcode.h >> +++ b/src/box/errcode.h >> @@ -278,6 +278,7 @@ struct errcode_record { >> /*223 */_(ER_INTERFERING_PROMOTE, "Instance with replica id %u was promoted first") \ >> /*224 */_(ER_RAFT_DISABLED, "Elections were turned off while running box.ctl.promote()")\ >> /*225 */_(ER_TXN_ROLLBACK, "Transaction was rolled back") \ >> + /*226 */_(ER_SYNCHRO_QUEUE_UNCLAIMED, "The synchronous transaction queue doesn't belong to any instance")\ > 1. Maybe SYNCHRO -> SYNC? The rationality is that we > already have a few ER_SYNC_* about synchro replication. Ok. >> diff --git a/test/box/error.result b/test/box/error.result >> index 062a90399..574521a14 100644 >> --- a/test/box/error.result >> +++ b/test/box/error.result >> @@ -444,6 +444,7 @@ t; >> | 223: box.error.INTERFERING_PROMOTE >> | 224: box.error.RAFT_DISABLED >> | 225: box.error.TXN_ROLLBACK >> + | 226: box.error.LIMBO_UNCLAIMED > 2. Forgot to update the result file? There is no LIMBO_UNCLAIMED error > code. It has a new name. Yep, sorry. >> diff --git a/test/replication/gh-5440-qsync-ro.test.lua b/test/replication/gh-5440-qsync-ro.test.lua >> deleted file mode 100644 >> index d63ec9c1e..000000000 >> --- a/test/replication/gh-5440-qsync-ro.test.lua > 3. Please, drop it from suite.cfg too. > Sure. Here's the diff: ======================== diff --git a/src/box/errcode.h b/src/box/errcode.h index e3943c01d..bb3cf5eb9 100644 --- a/src/box/errcode.h +++ b/src/box/errcode.h @@ -278,7 +278,7 @@ struct errcode_record {         /*223 */_(ER_INTERFERING_PROMOTE,       "Instance with replica id %u was promoted first") \         /*224 */_(ER_RAFT_DISABLED,             "Elections were turned off while running box.ctl.promote()")\         /*225 */_(ER_TXN_ROLLBACK,              "Transaction was rolled back") \ -       /*226 */_(ER_SYNCHRO_QUEUE_UNCLAIMED,   "The synchronous transaction queue doesn't belong to any instance")\ +       /*226 */_(ER_SYNC_QUEUE_UNCLAIMED,      "The synchronous transaction queue doesn't belong to any instance")\  /*   * !IMPORTANT! Please follow instructions at start of the file diff --git a/src/box/txn_limbo.c b/src/box/txn_limbo.c index b6e844f32..1dc093400 100644 --- a/src/box/txn_limbo.c +++ b/src/box/txn_limbo.c @@ -97,7 +97,7 @@ txn_limbo_append(struct txn_limbo *limbo, uint32_t id, struct txn *txn)         if (id == 0)                 id = instance_id;         if  (limbo->owner_id == REPLICA_ID_NIL) { -               diag_set(ClientError, ER_SYNCHRO_QUEUE_UNCLAIMED); +               diag_set(ClientError, ER_SYNC_QUEUE_UNCLAIMED);                 return NULL;         } else if (limbo->owner_id != id) {                 diag_set(ClientError, ER_UNCOMMITTED_FOREIGN_SYNC_TXNS, diff --git a/test/box/error.result b/test/box/error.result index 574521a14..dfe593dc2 100644 --- a/test/box/error.result +++ b/test/box/error.result @@ -444,7 +444,7 @@ t;   |   223: box.error.INTERFERING_PROMOTE   |   224: box.error.RAFT_DISABLED   |   225: box.error.TXN_ROLLBACK - |   226: box.error.LIMBO_UNCLAIMED + |   226: box.error.SYNC_QUEUE_UNCLAIMED   | ...  test_run:cmd("setopt delimiter ''"); diff --git a/test/replication/suite.cfg b/test/replication/suite.cfg index 4fc6643e4..c0854f7fa 100644 --- a/test/replication/suite.cfg +++ b/test/replication/suite.cfg @@ -41,7 +41,6 @@      "gh-4739-vclock-assert.test.lua": {},      "gh-4730-applier-rollback.test.lua": {},      "gh-4928-tx-boundaries.test.lua": {}, -    "gh-5440-qsync-ro.test.lua": {},      "gh-5435-qsync-clear-synchro-queue-commit-all.test.lua": {},      "gh-5536-wal-limit.test.lua": {},      "gh-5566-final-join-synchro.test.lua": {}, ======================== -- Serge Petrenko