From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-f193.google.com (mail-lj1-f193.google.com [209.85.208.193]) (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 429FD445325 for ; Fri, 10 Jul 2020 16:54:14 +0300 (MSK) Received: by mail-lj1-f193.google.com with SMTP id z24so6522231ljn.8 for ; Fri, 10 Jul 2020 06:54:14 -0700 (PDT) From: Cyrill Gorcunov Date: Fri, 10 Jul 2020 16:53:35 +0300 Message-Id: <20200710135336.259208-4-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 3/4] qsync: txn_limbo_read_rollback -- use txn_limbo_abort List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tml Cc: Vladislav Shpilevoy Bsaically this is the same what txn_limbo_abort does. 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 973ef96e8..9f872f4b5 100644 --- a/src/box/txn_limbo.c +++ b/src/box/txn_limbo.c @@ -363,8 +363,7 @@ txn_limbo_read_rollback(struct txn_limbo *limbo, int64_t lsn) if (last_rollback == NULL) return; rlist_foreach_entry_safe_reverse(e, &limbo->queue, in_queue, tmp) { - e->is_rollback = true; - 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); if (e->txn->signature >= 0) { -- 2.26.2