From 907e5a53b781fba6f4e115bc52fe8248e9752f06 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Thu, 5 Mar 2020 15:29:37 +0300
Subject: [PATCH] box/txn: move setup of txn start to txn_prepare
For unification sake, we will handle nop transactions
via common helper for both sync and async cases.
Acked-by: Konstantin Osipov <kostja.osipov@gmail.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
src/box/txn.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/box/txn.c b/src/box/txn.c
index 9f61303ab2..6bb1b06ed9 100644
--- a/src/box/txn.c
+++ b/src/box/txn.c
@@ -554,6 +554,8 @@ txn_prepare(struct txn *txn)
trigger_clear(&txn->fiber_on_stop);
if (!txn_has_flag(txn, TXN_CAN_YIELD))
trigger_clear(&txn->fiber_on_yield);
+
+ txn->start_tm = ev_monotonic_now(loop());
return 0;
}
@@ -569,7 +571,6 @@ txn_commit_async(struct txn *txn)
* After this point the transaction must not be used
* so reset the corresponding key in the fiber storage.
*/
- txn->start_tm = ev_monotonic_now(loop());
if (txn->n_new_rows + txn->n_applier_rows == 0) {
/* Nothing to do. */
txn->signature = 0;
--
GitLab