[Tarantool-patches] [PATCH] box/txn: do not zap fiber txn pointer before txn_write_to_wal completes

[Konstantin Osipov]

* Cyrill Gorcunov <gorcunov at gmail.com> [20/01/24 18:18]:
> 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

Wile I agree this call chain is problematic...


> 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);

I believe Georgy added this for a reason - since the current fiber
is no longer locked until the transaction is resumed, it should
be removed from the fiber key (this change AFAIU comes from
parallel applier patch).

I suggest you move this statement inside txn_write_to_wal(). I
can't find a good place for it yet though.

-- 
Konstantin Osipov, Moscow, Russia