From: Serge Petrenko via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>, gorcunov@gmail.com Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH 2/7] replication: forbid implicit limbo owner transition Date: Mon, 21 Jun 2021 13:13:02 +0300 [thread overview] Message-ID: <b7710586-2bdd-1f00-557e-594b951c7d2e@tarantool.org> (raw) In-Reply-To: <1819defc-9d99-c3f0-41d1-52955c5af02c@tarantool.org> 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
next prev parent reply other threads:[~2021-06-21 10:13 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-10 13:32 [Tarantool-patches] [PATCH 0/7] forbid implicit limbo ownership transition Serge Petrenko via Tarantool-patches 2021-06-10 13:32 ` [Tarantool-patches] [PATCH 1/7] replication: always send raft state to subscribers Serge Petrenko via Tarantool-patches 2021-06-10 16:47 ` Cyrill Gorcunov via Tarantool-patches 2021-06-11 8:43 ` Serge Petrenko via Tarantool-patches 2021-06-11 8:44 ` Cyrill Gorcunov via Tarantool-patches 2021-06-15 20:53 ` Vladislav Shpilevoy via Tarantool-patches 2021-06-17 21:00 ` Serge Petrenko via Tarantool-patches 2021-06-10 13:32 ` [Tarantool-patches] [PATCH 2/7] replication: forbid implicit limbo owner transition Serge Petrenko via Tarantool-patches 2021-06-15 20:55 ` Vladislav Shpilevoy via Tarantool-patches 2021-06-17 21:00 ` Serge Petrenko via Tarantool-patches 2021-06-18 22:49 ` Vladislav Shpilevoy via Tarantool-patches 2021-06-21 10:13 ` Serge Petrenko via Tarantool-patches [this message] 2021-06-10 13:32 ` [Tarantool-patches] [PATCH 3/7] txn_limbo: fix promote term filtering Serge Petrenko via Tarantool-patches 2021-06-15 20:57 ` Vladislav Shpilevoy via Tarantool-patches 2021-06-17 21:00 ` Serge Petrenko via Tarantool-patches 2021-06-18 22:49 ` Vladislav Shpilevoy via Tarantool-patches 2021-06-21 8:55 ` Serge Petrenko via Tarantool-patches 2021-06-10 13:32 ` [Tarantool-patches] [PATCH 4/7] txn_limbo: persist the latest effective promote in snapshot Serge Petrenko via Tarantool-patches 2021-06-15 20:59 ` Vladislav Shpilevoy via Tarantool-patches 2021-06-17 21:00 ` Serge Petrenko via Tarantool-patches 2021-06-10 13:32 ` [Tarantool-patches] [PATCH 5/7] replication: send latest effective promote in initial join Serge Petrenko via Tarantool-patches 2021-06-15 21:00 ` Vladislav Shpilevoy via Tarantool-patches 2021-06-17 21:00 ` Serge Petrenko via Tarantool-patches 2021-06-18 22:52 ` Vladislav Shpilevoy via Tarantool-patches 2021-06-21 10:12 ` Serge Petrenko via Tarantool-patches 2021-06-10 13:32 ` [Tarantool-patches] [PATCH 6/7] box: introduce `box.ctl.demote` Serge Petrenko via Tarantool-patches 2021-06-18 22:52 ` Vladislav Shpilevoy via Tarantool-patches 2021-06-21 14:56 ` Serge Petrenko via Tarantool-patches 2021-06-10 13:32 ` [Tarantool-patches] [PATCH 7/7] box: make promote/demote always bump the term Serge Petrenko via Tarantool-patches 2021-06-15 21:00 ` Vladislav Shpilevoy via Tarantool-patches 2021-06-17 21:00 ` Serge Petrenko via Tarantool-patches 2021-06-18 22:53 ` Vladislav Shpilevoy via Tarantool-patches 2021-06-21 15:02 ` Serge Petrenko via Tarantool-patches 2021-06-15 20:53 ` [Tarantool-patches] [PATCH 0/7] forbid implicit limbo ownership transition Vladislav Shpilevoy via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=b7710586-2bdd-1f00-557e-594b951c7d2e@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=gorcunov@gmail.com \ --cc=sergepetrenko@tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 2/7] replication: forbid implicit limbo owner transition' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox