Tarantool development patches archive
 help / color / mirror / Atom feed
From: Cyrill Gorcunov <gorcunov@gmail.com>
To: tml <tarantool-patches@dev.tarantool.org>
Cc: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Subject: [Tarantool-patches] [PATCH 4/4] qsync: txn_limbo_wait_complete -- use txn_limbo_abort
Date: Fri, 10 Jul 2020 16:53:36 +0300	[thread overview]
Message-ID: <20200710135336.259208-5-gorcunov@gmail.com> (raw)
In-Reply-To: <20200710135336.259208-1-gorcunov@gmail.com>

Instead of open coding.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
 src/box/txn_limbo.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/box/txn_limbo.c b/src/box/txn_limbo.c
index 9f872f4b5..207487a4d 100644
--- a/src/box/txn_limbo.c
+++ b/src/box/txn_limbo.c
@@ -198,9 +198,8 @@ txn_limbo_wait_complete(struct txn_limbo *limbo, struct txn_limbo_entry *entry)
 	struct txn_limbo_entry *e, *tmp;
 	rlist_foreach_entry_safe_reverse(e, &limbo->queue,
 					 in_queue, tmp) {
-		e->is_rollback = true;
 		e->txn->signature = TXN_SIGNATURE_QUORUM_TIMEOUT;
-		txn_limbo_pop(limbo, e);
+		txn_limbo_abort(limbo, e);
 		txn_clear_flag(e->txn, TXN_WAIT_SYNC);
 		txn_clear_flag(e->txn, TXN_WAIT_ACK);
 		txn_complete(e->txn);
-- 
2.26.2

  parent reply	other threads:[~2020-07-10 13:54 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-10 13:53 [Tarantool-patches] [PATCH 0/4] qsync: continue cleanup Cyrill Gorcunov
2020-07-10 13:53 ` [Tarantool-patches] [PATCH 1/4] qsync: txn_limbo_assign_local_lsn -- drop redundant declaration Cyrill Gorcunov
2020-07-10 13:53 ` [Tarantool-patches] [PATCH 2/4] qsync: txn_limbo_pop -- drop fake reference Cyrill Gorcunov
2020-07-10 13:53 ` [Tarantool-patches] [PATCH 3/4] qsync: txn_limbo_read_rollback -- use txn_limbo_abort Cyrill Gorcunov
2020-07-10 13:53 ` Cyrill Gorcunov [this message]
2020-07-10 20:40 ` [Tarantool-patches] [PATCH 0/4] qsync: continue cleanup Vladislav Shpilevoy
2020-07-11 16:08   ` Vladislav Shpilevoy

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=20200710135336.259208-5-gorcunov@gmail.com \
    --to=gorcunov@gmail.com \
    --cc=tarantool-patches@dev.tarantool.org \
    --cc=v.shpilevoy@tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH 4/4] qsync: txn_limbo_wait_complete -- use txn_limbo_abort' \
    /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