From: Serge Petrenko <sergepetrenko@tarantool.org> To: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>, Cyrill Gorcunov <gorcunov@gmail.com> Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH 1/4] box: add a single execution guard to clear_synchro_queue Date: Mon, 21 Dec 2020 13:18:40 +0300 [thread overview] Message-ID: <99e20e44-9833-5e32-00dc-d6ed91058960@tarantool.org> (raw) In-Reply-To: <3d0aa43b-bd36-12b3-2abd-754468f2a301@tarantool.org> 18.12.2020 00:43, Vladislav Shpilevoy пишет: > Hi! Thanks for the patch! Looks fine. Only 2 notes below. Thanks for the review! >> diff --git a/src/box/box.cc b/src/box/box.cc index >> a8bc3471d..8e0c9a160 100644 --- a/src/box/box.cc +++ b/src/box/box.cc >> @@ -1001,15 +1001,25 @@ box_set_replication_anon(void) } -void +int >> box_clear_synchro_queue(bool try_wait) { + /* A guard to block >> multiple simultaneous function invocations. */ + static bool >> in_clear_synchro_queue = false; + if (in_clear_synchro_queue) { + >> diag_set(ClientError, ER_UNSUPPORTED, "clear_synchro_queue", + >> "simultaneous invocations"); + return -1; + } if (!is_box_configured >> || txn_limbo_is_empty(&txn_limbo)) - return; + return 0; uint32_t >> former_leader_id = txn_limbo.owner_id; assert(former_leader_id != >> REPLICA_ID_NIL); if (former_leader_id == instance_id) - return; + >> return 0; + + in_clear_synchro_queue = true; + auto guard = >> make_scoped_guard([&] { in_clear_synchro_queue = false; }); > I would better not use C++ here, because guards were introduced only > for protection against exceptions. I agree. I thought there would be multiple returns below so I introduced the guard to not write ``` in_clear_synchro_queue = false; return 0; ``` every time. Turns out there are only 2 such places, and I can still use `goto end` to omit an extraneous `in_clear_synchro_queue = false`. The diff for this commit is below. > But I don't mind having this guard here if you want it. Only my thoughts. >> if (try_wait) { /* Wait until pending confirmations/rollbacks reach >> us. */ diff --git a/src/box/lua/ctl.c b/src/box/lua/ctl.c index >> bf26465e6..a3447f3e7 100644 --- a/src/box/lua/ctl.c +++ >> b/src/box/lua/ctl.c @@ -81,8 +81,8 @@ lbox_ctl_on_schema_init(struct >> lua_State *L) static int lbox_ctl_clear_synchro_queue(struct >> lua_State *L) { - (void) L; - box_clear_synchro_queue(true); + if >> (box_clear_synchro_queue(true) != 0) + return luaT_error(L); > Maybe better use nil + error object return way? I thought we still use > it in the new code. Hm, I haven't seen us do that in lua/C. As far as I know, every box.* method throws a lua error in case of failure. I may miss something. Is there a reason for returning nil + error instead of throwing? ============================================== ``` diff --git a/src/box/box.cc b/src/box/box.cc index 8e0c9a160..6f7a89d8d 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -1019,7 +1019,6 @@ box_clear_synchro_queue(bool try_wait) return 0; in_clear_synchro_queue = true; - auto guard = make_scoped_guard([&] { in_clear_synchro_queue = false; }); if (try_wait) { /* Wait until pending confirmations/rollbacks reach us. */ @@ -1060,6 +1059,8 @@ box_clear_synchro_queue(bool try_wait) txn_limbo_force_empty(&txn_limbo, confirm_lsn); assert(txn_limbo_is_empty(&txn_limbo)); } + + in_clear_synchro_queue = false; return 0; } ``` > -- Serge Petrenko
next prev parent reply other threads:[~2020-12-21 10:18 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-12-10 20:55 [Tarantool-patches] [PATCH 0/4] make clear_synchro_queue commit everything Serge Petrenko 2020-12-10 20:55 ` [Tarantool-patches] [PATCH 1/4] box: add a single execution guard to clear_synchro_queue Serge Petrenko 2020-12-17 21:43 ` Vladislav Shpilevoy 2020-12-21 10:18 ` Serge Petrenko [this message] 2020-12-21 17:11 ` Vladislav Shpilevoy 2020-12-23 12:01 ` Serge Petrenko 2020-12-10 20:55 ` [Tarantool-patches] [PATCH 2/4] relay: rename is_raft_enabled message to relay_is_running Serge Petrenko 2020-12-17 21:43 ` Vladislav Shpilevoy 2020-12-23 12:01 ` Serge Petrenko 2020-12-10 20:55 ` [Tarantool-patches] [PATCH 3/4] relay: introduce relay_lsn_watcher Serge Petrenko 2020-12-17 21:43 ` Vladislav Shpilevoy [not found] ` <4b7f4fc1-6d48-4332-c432-1eeb0b28c016@tarantool.org> 2020-12-23 12:03 ` Serge Petrenko 2020-12-10 20:55 ` [Tarantool-patches] [PATCH 4/4] box: rework clear_synchro_queue to commit everything Serge Petrenko 2020-12-17 21:43 ` Vladislav Shpilevoy 2020-12-23 12:04 ` Serge Petrenko 2020-12-11 7:15 ` [Tarantool-patches] [PATCH 0/4] make clear_synchro_queue " Serge Petrenko 2020-12-11 9:19 ` Serge Petrenko
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=99e20e44-9833-5e32-00dc-d6ed91058960@tarantool.org \ --to=sergepetrenko@tarantool.org \ --cc=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 1/4] box: add a single execution guard to clear_synchro_queue' \ /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