From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp1.mail.ru (smtp1.mail.ru [94.100.179.111]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id CB3D241C5DD for ; Wed, 1 Jul 2020 20:14:38 +0300 (MSK) Date: Wed, 1 Jul 2020 20:14:37 +0300 From: Sergey Ostanevich Message-ID: <20200701171437.GD45053@tarantool.org> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Subject: Re: [Tarantool-patches] [PATCH v2 03/19] txn: add TXN_WAIT_ACK flag List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Vladislav Shpilevoy Cc: tarantool-patches@dev.tarantool.org Hi! Thanks for the patch! Need updates from 19/19, otherwise good. Sergos. On 30 Jun 01:15, Vladislav Shpilevoy wrote: > When a transaction touches a synchronous space, its commit > procedure changes. The transaction enters state of 'waiting for > acks' from replicas and from own master's WAL. > > To denote the state there is a new transaction flag - > TXN_WAIT_ACK. > > Part of #4844 > --- > src/box/txn.c | 6 ++++++ > src/box/txn.h | 7 +++++++ > 2 files changed, 13 insertions(+) > > diff --git a/src/box/txn.c b/src/box/txn.c > index 123520166..edc1f5180 100644 > --- a/src/box/txn.c > +++ b/src/box/txn.c > @@ -495,6 +495,7 @@ txn_journal_entry_new(struct txn *txn) > > struct xrow_header **remote_row = req->rows; > struct xrow_header **local_row = req->rows + txn->n_applier_rows; > + bool is_sync = false; > > stailq_foreach_entry(stmt, &txn->stmts, next) { > if (stmt->has_triggers) { > @@ -506,6 +507,9 @@ txn_journal_entry_new(struct txn *txn) > if (stmt->row == NULL) > continue; > > + is_sync = is_sync || (stmt->space != NULL && > + stmt->space->def->opts.is_sync); > + > if (stmt->row->replica_id == 0) > *local_row++ = stmt->row; > else > @@ -513,6 +517,8 @@ txn_journal_entry_new(struct txn *txn) > > req->approx_len += xrow_approx_len(stmt->row); > } > + if (is_sync) > + txn_set_flag(txn, TXN_WAIT_ACK); > > assert(remote_row == req->rows + txn->n_applier_rows); > assert(local_row == remote_row + txn->n_new_rows); > diff --git a/src/box/txn.h b/src/box/txn.h > index 3f6d79d5c..232cc07a8 100644 > --- a/src/box/txn.h > +++ b/src/box/txn.h > @@ -66,6 +66,13 @@ enum txn_flag { > TXN_CAN_YIELD, > /** on_commit and/or on_rollback list is not empty. */ > TXN_HAS_TRIGGERS, > + /** > + * Transaction, touched sync spaces, enters 'waiting for > + * acks' state before commit. In this state it waits until > + * it is replicated onto a quorum of replicas, and only > + * then finishes commit and returns success to a user. > + */ > + TXN_WAIT_ACK, > }; > > enum { > -- > 2.21.1 (Apple Git-122.3) >