From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-f194.google.com (mail-lj1-f194.google.com [209.85.208.194]) (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 3BAC44696C4 for ; Tue, 28 Jan 2020 00:53:55 +0300 (MSK) Received: by mail-lj1-f194.google.com with SMTP id h23so12572206ljc.8 for ; Mon, 27 Jan 2020 13:53:55 -0800 (PST) From: Cyrill Gorcunov Date: Tue, 28 Jan 2020 00:53:05 +0300 Message-Id: <20200127215306.31681-5-gorcunov@gmail.com> In-Reply-To: <20200127215306.31681-1-gorcunov@gmail.com> References: <20200127215306.31681-1-gorcunov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v5 4/5] errinj: add ERRINJ_REPLICA_TXN_WRITE List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tml To test rollback error nil dereference Signed-off-by: Cyrill Gorcunov --- src/box/applier.cc | 6 ++++++ src/lib/core/errinj.h | 1 + 2 files changed, 7 insertions(+) diff --git a/src/box/applier.cc b/src/box/applier.cc index 967dc91de..e739f23e2 100644 --- a/src/box/applier.cc +++ b/src/box/applier.cc @@ -51,6 +51,7 @@ #include "txn.h" #include "box.h" #include "scoped_guard.h" +#include "errinj.h" STRS(applier_state, applier_STATE); @@ -830,6 +831,11 @@ applier_apply_tx(struct stailq *rows) trigger_create(on_commit, applier_txn_commit_cb, NULL, NULL); txn_on_commit(txn, on_commit); + ERROR_INJECT(ERRINJ_REPLICA_TXN_WRITE, { + diag_set(ClientError, ER_INJECTION, "replica txn write injection"); + goto rollback; + }); + if (txn_write(txn) < 0) goto fail; diff --git a/src/lib/core/errinj.h b/src/lib/core/errinj.h index 672da2119..da6adfe97 100644 --- a/src/lib/core/errinj.h +++ b/src/lib/core/errinj.h @@ -135,6 +135,7 @@ struct errinj { _(ERRINJ_COIO_SENDFILE_CHUNK, ERRINJ_INT, {.iparam = -1}) \ _(ERRINJ_SWIM_FD_ONLY, ERRINJ_BOOL, {.bparam = false}) \ _(ERRINJ_DYN_MODULE_COUNT, ERRINJ_INT, {.iparam = 0}) \ + _(ERRINJ_REPLICA_TXN_WRITE, ERRINJ_BOOL, {.bparam = false}) \ ENUM0(errinj_id, ERRINJ_LIST); extern struct errinj errinjs[]; -- 2.20.1