From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) (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 4A01D46970E for ; Fri, 24 Jan 2020 18:17:10 +0300 (MSK) Received: by mail-lj1-f195.google.com with SMTP id h23so2872378ljc.8 for ; Fri, 24 Jan 2020 07:17:10 -0800 (PST) From: Cyrill Gorcunov Date: Fri, 24 Jan 2020 18:17:06 +0300 Message-Id: <20200124151706.18482-1-gorcunov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH] box/txn: do not zap fiber txn pointer before txn_write_to_wal completes List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tml The txn_write_to_wal operates with txn by own: on success it calls txn_entry_done_cb which completes transaction, on error it calls txn_rollback which expects the transaction we're rolling back is the one the fiber carries in storage. | txn_write | fiber_set_txn(fiber(), NULL); // zap fiber's storage.txn | txn_write_to_wal(txn); | journal_entry_new(..., txn_entry_done_cb, ...) | if (req == NULL) | txn_rollback(txn); | assert(txn == in_txn()); // in_txn()=nil, triggers Signed-off-by: Cyrill Gorcunov --- Not for merging! I need to create a proper testcase with error injection. Sending it out for early review since I'm hunting another issue right now and this patch just to not loose the info. src/box/txn.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/box/txn.c b/src/box/txn.c index bedb57449..060d91536 100644 --- a/src/box/txn.c +++ b/src/box/txn.c @@ -583,7 +583,6 @@ txn_write(struct txn *txn) fiber_set_txn(fiber(), NULL); return 0; } - fiber_set_txn(fiber(), NULL); return txn_write_to_wal(txn); } -- 2.20.1