From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-f193.google.com (mail-lj1-f193.google.com [209.85.208.193]) (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 43DFB469719 for ; Fri, 20 Mar 2020 13:22:57 +0300 (MSK) Received: by mail-lj1-f193.google.com with SMTP id o10so5782557ljc.8 for ; Fri, 20 Mar 2020 03:22:57 -0700 (PDT) Date: Fri, 20 Mar 2020 13:22:54 +0300 From: Konstantin Osipov Message-ID: <20200320102254.GB20273@atlas> References: <20200320081956.30650-1-gorcunov@gmail.com> <20200320081956.30650-12-gorcunov@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200320081956.30650-12-gorcunov@gmail.com> Subject: Re: [Tarantool-patches] [PATCH v15 11/11] box/journal: redesign journal operations List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cyrill Gorcunov Cc: tml * Cyrill Gorcunov [20/03/20 11:25]: > Redesing notes: Redesign > +int > +journal_no_write_async(struct journal *journal, > + struct journal_entry *entry) > +{ > + (void)journal; > + > + assert(true); > + entry->res = -1; You have to set the diagnostics area if you return -1, otherwise you'll get a crash in production. > + return -1; > +} > + > +void > +journal_no_write_async_cb(struct journal_entry *entry) > +{ > + assert(true); > + entry->res = -1; Same here. > @@ -636,21 +628,28 @@ txn_commit(struct txn *txn) > return -1; > } > > - if (txn_write_to_wal(req) != 0) > + fiber_set_txn(fiber(), NULL); > + if (journal_write(req) != 0) { > + fiber_set_txn(fiber(), txn); I wonder why do you need to clear/set txn in txn_commit()? > + txn_rollback(txn); > + txn_free(txn); > + > + diag_set(ClientError, ER_WAL_IO); > + diag_log(); > return -1; > + } > > - /* > - * In case of non-yielding journal the transaction could already > - * be done and there is nothing to wait in such cases. > - */ > if (!txn_has_flag(txn, TXN_IS_DONE)) { > - bool cancellable = fiber_set_cancellable(false); > - fiber_yield(); > - fiber_set_cancellable(cancellable); > + txn->signature = req->res; > + txn_complete(txn); > + fiber_set_txn(fiber(), NULL); Seems you do it twice ? -- Konstantin Osipov, Moscow, Russia