From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-f66.google.com (mail-lf1-f66.google.com [209.85.167.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 99B4B445320 for ; Fri, 10 Jul 2020 16:54:25 +0300 (MSK) Received: by mail-lf1-f66.google.com with SMTP id y18so3232243lfh.11 for ; Fri, 10 Jul 2020 06:54:25 -0700 (PDT) From: Cyrill Gorcunov Date: Fri, 10 Jul 2020 16:53:36 +0300 Message-Id: <20200710135336.259208-5-gorcunov@gmail.com> In-Reply-To: <20200710135336.259208-1-gorcunov@gmail.com> References: <20200710135336.259208-1-gorcunov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH 4/4] qsync: txn_limbo_wait_complete -- use txn_limbo_abort List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tml Cc: Vladislav Shpilevoy Instead of open coding. Signed-off-by: Cyrill Gorcunov --- 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