From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp51.i.mail.ru (smtp51.i.mail.ru [94.100.177.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 A163E430414 for ; Wed, 26 Aug 2020 10:53:12 +0300 (MSK) From: Serge Petrenko Date: Wed, 26 Aug 2020 10:52:41 +0300 Message-Id: <180461b1efe572162acb9b50e485684dc8d74ff2.1598427905.git.sergepetrenko@tarantool.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [RAFT 09/10] [tosquash] applier: handler error at raft row appliance List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: v.shpilevoy@tarantool.org, gorcunov@gmail.com, sergos@tarantool.org Cc: tarantool-patches@dev.tarantool.org From: Vladislav Shpilevoy --- src/box/applier.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/box/applier.cc b/src/box/applier.cc index 8e6d1b2a4..b17ac5363 100644 --- a/src/box/applier.cc +++ b/src/box/applier.cc @@ -1241,10 +1241,13 @@ applier_subscribe(struct applier *applier) &stailq_first_entry(&rows, struct applier_tx_row, next)->row; if (first_row->lsn == 0) { - if (unlikely(iproto_type_is_raft_request(first_row->type))) - apply_raft_row(first_row); - else + if (unlikely(iproto_type_is_raft_request( + first_row->type))) { + if (apply_raft_row(first_row) != 0) + diag_raise(); + } else { applier_signal_ack(applier); + } } else if (applier_apply_tx(&rows) != 0) { diag_raise(); } -- 2.20.1 (Apple Git-117)