From: sergeyb@tarantool.org To: tarantool-patches@dev.tarantool.org, v.shpilevoy@tarantool.org, sergepetrenko@tarantool.org, gorcunov@gmail.com, lvasiliev@tarantool.org Subject: [Tarantool-patches] [PATCH 1/3] replication: print number of txs in limbo before its clear Date: Thu, 9 Jul 2020 20:16:44 +0300 [thread overview] Message-ID: <a7d1648b56e5b63009d56b844b30620739f8f661.1594314820.git.sergeyb@tarantool.org> (raw) In-Reply-To: <cover.1593472477.git.v.shpilevoy@tarantool.org From: Sergey Bronnikov <sergeyb@tarantool.org> --- src/box/box.cc | 10 ++++++---- src/box/box.h | 2 +- src/box/lua/ctl.c | 5 +++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/box/box.cc b/src/box/box.cc index 749c96ca1..a400ed551 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -946,15 +946,15 @@ box_set_replication_anon(void) } -void +int box_clear_synchro_queue(void) { if (!is_box_configured || txn_limbo_is_empty(&txn_limbo)) - return; + return -1; uint32_t former_leader_id = txn_limbo.instance_id; assert(former_leader_id != REPLICA_ID_NIL); if (former_leader_id == instance_id) - return; + return -2; /* Wait until pending confirmations/rollbacks reach us. */ double timeout = 2 * txn_limbo_confirm_timeout(&txn_limbo); @@ -965,9 +965,9 @@ box_clear_synchro_queue(void) fiber_sleep(0.001); } + int len = 0; if (!txn_limbo_is_empty(&txn_limbo)) { int64_t lsns[VCLOCK_MAX]; - int len = 0; const struct vclock *vclock; replicaset_foreach(replica) { if (replica->relay != NULL && @@ -993,6 +993,8 @@ box_clear_synchro_queue(void) txn_limbo_force_empty(&txn_limbo, confirm_lsn); assert(txn_limbo_is_empty(&txn_limbo)); } + + return len; } void diff --git a/src/box/box.h b/src/box/box.h index 5c4a5ed78..608e26b83 100644 --- a/src/box/box.h +++ b/src/box/box.h @@ -258,7 +258,7 @@ extern "C" { typedef struct tuple box_tuple_t; -void box_clear_synchro_queue(void); +int box_clear_synchro_queue(void); /* box_select is private and used only by FFI */ API_EXPORT int diff --git a/src/box/lua/ctl.c b/src/box/lua/ctl.c index 2017ddc18..c3cf44f0c 100644 --- a/src/box/lua/ctl.c +++ b/src/box/lua/ctl.c @@ -82,8 +82,9 @@ static int lbox_ctl_clear_synchro_queue(struct lua_State *L) { (void) L; - box_clear_synchro_queue(); - return 0; + int len = box_clear_synchro_queue(); + lua_pushinteger(L, len); + return 1; } static const struct luaL_Reg lbox_ctl_lib[] = { -- 2.26.2
next parent reply other threads:[~2020-07-09 17:16 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <cover.1594314820.git.sergeyb@tarantool.org> 2020-07-09 17:16 ` sergeyb [this message] 2020-07-09 20:07 ` Vladislav Shpilevoy 2020-07-10 12:55 ` Sergey Bronnikov 2020-07-20 21:59 ` Vladislav Shpilevoy 2020-07-09 17:16 ` [Tarantool-patches] [PATCH 2/3] replication: test clear_synchro_queue function sergeyb 2020-07-20 22:00 ` Vladislav Shpilevoy 2020-08-25 12:49 ` Sergey Bronnikov 2020-08-26 7:31 ` Serge Petrenko 2020-08-26 14:48 ` Sergey Bronnikov 2020-07-09 17:16 ` [Tarantool-patches] [PATCH 3/3] replication: add test with random leaders promotion and demotion sergeyb 2020-07-09 20:07 ` Vladislav Shpilevoy 2020-07-10 8:05 ` Sergey Bronnikov 2020-07-20 22:01 ` Vladislav Shpilevoy 2020-08-26 14:45 ` Sergey Bronnikov 2020-08-27 10:49 ` Serge Petrenko 2020-08-31 10:05 ` Sergey Bronnikov 2020-09-01 13:03 ` Serge Petrenko 2020-11-12 9:32 ` Sergey Bronnikov
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=a7d1648b56e5b63009d56b844b30620739f8f661.1594314820.git.sergeyb@tarantool.org \ --to=sergeyb@tarantool.org \ --cc=gorcunov@gmail.com \ --cc=lvasiliev@tarantool.org \ --cc=sergepetrenko@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 1/3] replication: print number of txs in limbo before its clear' \ /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