diff --git a/src/box/applier.cc b/src/box/applier.cc index ff40e03c6b28f765990d37c992aa227aabebaf8f..8666a3a98418d33eebb35c7546ac03603360d956 100644 --- a/src/box/applier.cc +++ b/src/box/applier.cc @@ -805,7 +805,7 @@ applier_apply_tx(struct stailq *rows) trigger_create(on_commit, applier_txn_commit_cb, NULL, NULL); txn_on_commit(txn, on_commit); - if (txn_write(txn) < 0) + if (txn_commit_async(txn) < 0) goto fail; /* Transaction was sent to journal so promote vclock. */ diff --git a/src/box/txn.c b/src/box/txn.c index 6799f6c4bb5544a9b283b385da71c6be00bdac7a..9f61303ab2d46bdad515101ee1fd15b6ea75dafc 100644 --- a/src/box/txn.c +++ b/src/box/txn.c @@ -558,7 +558,7 @@ txn_prepare(struct txn *txn) } int -txn_write(struct txn *txn) +txn_commit_async(struct txn *txn) { if (txn_prepare(txn) != 0) { txn_rollback(txn); @@ -586,7 +586,7 @@ txn_commit(struct txn *txn) { txn->fiber = fiber(); - if (txn_write(txn) != 0) + if (txn_commit_async(txn) != 0) return -1; /* * In case of non-yielding journal the transaction could already diff --git a/src/box/txn.h b/src/box/txn.h index 7a7e5295410e7e5599b2902cdaaaae5000557150..b950e2e188b2941e440872b9d3cfe72250480ad5 100644 --- a/src/box/txn.h +++ b/src/box/txn.h @@ -300,7 +300,7 @@ txn_rollback(struct txn *txn); * freed. */ int -txn_write(struct txn *txn); +txn_commit_async(struct txn *txn); /** * Most txns don't have triggers, and txn objects