From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (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 EE83A4696C9 for ; Tue, 7 Apr 2020 18:16:48 +0300 (MSK) Received: by mail-lf1-f54.google.com with SMTP id 131so2639698lfh.11 for ; Tue, 07 Apr 2020 08:16:48 -0700 (PDT) From: Cyrill Gorcunov Date: Tue, 7 Apr 2020 18:15:01 +0300 Message-Id: <20200407151500.3410-9-gorcunov@gmail.com> In-Reply-To: <20200407151500.3410-1-gorcunov@gmail.com> References: <20200407151500.3410-1-gorcunov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v12 8/8] test: add replication/gh-4730-applier-rollback List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kirill Yukhin Cc: tml Test that diag_raise doesn't happen if async transaction fails inside replication procedure. Side note: I don't like merging tests with patches in general and I hate doing so for big tests with a passion because it hides the patch code itself. So here is a separate patch on top of the fix. Test-of #4730 Acked-by: Serge Petrenko Signed-off-by: Cyrill Gorcunov --- src/box/txn.c | 13 ++ src/lib/core/errinj.h | 1 + test/box/errinj.result | 1 + .../gh-4730-applier-rollback.result | 145 ++++++++++++++++++ .../gh-4730-applier-rollback.test.lua | 73 +++++++++ test/replication/replica-applier-rollback.lua | 16 ++ test/replication/suite.cfg | 1 + test/replication/suite.ini | 2 +- 8 files changed, 251 insertions(+), 1 deletion(-) create mode 100644 test/replication/gh-4730-applier-rollback.result create mode 100644 test/replication/gh-4730-applier-rollback.test.lua create mode 100644 test/replication/replica-applier-rollback.lua diff --git a/src/box/txn.c b/src/box/txn.c index f9c3e3675..488aa4bdd 100644 --- a/src/box/txn.c +++ b/src/box/txn.c @@ -34,6 +34,7 @@ #include "journal.h" #include #include "xrow.h" +#include "errinj.h" double too_long_threshold; @@ -576,6 +577,18 @@ txn_commit_async(struct txn *txn) { struct journal_entry *req; + ERROR_INJECT(ERRINJ_TXN_COMMIT_ASYNC, { + diag_set(ClientError, ER_INJECTION, + "txn commit async injection"); + /* + * Log it for the testing sake: we grep + * output to mark this event. + */ + diag_log(); + txn_rollback(txn); + return -1; + }); + if (txn_prepare(txn) != 0) { txn_rollback(txn); return -1; diff --git a/src/lib/core/errinj.h b/src/lib/core/errinj.h index ee6c57a0d..7577ed11a 100644 --- a/src/lib/core/errinj.h +++ b/src/lib/core/errinj.h @@ -139,6 +139,7 @@ struct errinj { _(ERRINJ_FIBER_MPROTECT, ERRINJ_INT, {.iparam = -1}) \ _(ERRINJ_RELAY_FASTER_THAN_TX, ERRINJ_BOOL, {.bparam = false}) \ _(ERRINJ_INDEX_RESERVE, ERRINJ_BOOL, {.bparam = false})\ + _(ERRINJ_TXN_COMMIT_ASYNC, ERRINJ_BOOL, {.bparam = false})\ ENUM0(errinj_id, ERRINJ_LIST); extern struct errinj errinjs[]; diff --git a/test/box/errinj.result b/test/box/errinj.result index 0d3fedeb3..de877b708 100644 --- a/test/box/errinj.result +++ b/test/box/errinj.result @@ -76,6 +76,7 @@ evals - ERRINJ_TUPLE_ALLOC: false - ERRINJ_TUPLE_FIELD: false - ERRINJ_TUPLE_FORMAT_COUNT: -1 + - ERRINJ_TXN_COMMIT_ASYNC: false - ERRINJ_VYRUN_DATA_READ: false - ERRINJ_VY_COMPACTION_DELAY: false - ERRINJ_VY_DELAY_PK_LOOKUP: false diff --git a/test/replication/gh-4730-applier-rollback.result b/test/replication/gh-4730-applier-rollback.result new file mode 100644 index 000000000..26a0eb6fa --- /dev/null +++ b/test/replication/gh-4730-applier-rollback.result @@ -0,0 +1,145 @@ +-- test-run result file version 2 +#!/usr/bin/env tarantool + | --- + | ... +-- +-- vim: ts=4 sw=4 et +-- + +test_run = require('test_run').new() + | --- + | ... + +-- +-- Allow replica to connect to us +box.schema.user.grant('guest', 'replication') + | --- + | ... + +-- +-- Create replica instance, we're the master and +-- start it, no data to sync yet though +test_run:cmd("create server replica_slave with rpl_master=default, script='replication/replica-applier-rollback.lua'") + | --- + | - true + | ... +test_run:cmd("start server replica_slave") + | --- + | - true + | ... + +-- +-- Fill initial data on the master instance +test_run:cmd('switch default') + | --- + | - true + | ... + +_ = box.schema.space.create('test') + | --- + | ... +s = box.space.test + | --- + | ... + +s:format({{name = 'id', type = 'unsigned'}, {name = 'band_name', type = 'string'}}) + | --- + | ... + +_ = s:create_index('primary', {type = 'tree', parts = {'id'}}) + | --- + | ... +s:insert({1, '1'}) + | --- + | - [1, '1'] + | ... +s:insert({2, '2'}) + | --- + | - [2, '2'] + | ... +s:insert({3, '3'}) + | --- + | - [3, '3'] + | ... + +-- +-- Wait for data from master get propagated +test_run:wait_lsn('replica_slave', 'default') + | --- + | ... + +-- +-- Now inject error into slave instance +test_run:cmd('switch replica_slave') + | --- + | - true + | ... + +-- +-- To make sure we're running +box.info.status + | --- + | - running + | ... + +-- +-- To fail inserting new record. +errinj = box.error.injection + | --- + | ... +errinj.set('ERRINJ_TXN_COMMIT_ASYNC', true) + | --- + | - ok + | ... + +-- +-- Jump back to master node and write new +-- entry which should cause error to happen +-- on slave instance +test_run:cmd('switch default') + | --- + | - true + | ... +s:insert({4, '4'}) + | --- + | - [4, '4'] + | ... + +-- +-- Wait for error to trigger +test_run:cmd('switch replica_slave') + | --- + | - true + | ... +fiber = require('fiber') + | --- + | ... +while test_run:grep_log('replica_slave', 'ER_INJECTION:[^\n]*') == nil do fiber.sleep(0.1) end + | --- + | ... + +---- +---- Such error cause the applier to be +---- cancelled and reaped, thus stop the +---- slave node and cleanup +test_run:cmd('switch default') + | --- + | - true + | ... + +-- +-- Cleanup +test_run:cmd("stop server replica_slave") + | --- + | - true + | ... +test_run:cmd("delete server replica_slave") + | --- + | - true + | ... +box.space.test:drop() + | --- + | ... +box.schema.user.revoke('guest', 'replication') + | --- + | ... diff --git a/test/replication/gh-4730-applier-rollback.test.lua b/test/replication/gh-4730-applier-rollback.test.lua new file mode 100644 index 000000000..de7a740de --- /dev/null +++ b/test/replication/gh-4730-applier-rollback.test.lua @@ -0,0 +1,73 @@ +#!/usr/bin/env tarantool +-- +-- vim: ts=4 sw=4 et +-- + +test_run = require('test_run').new() + +-- +-- Allow replica to connect to us +box.schema.user.grant('guest', 'replication') + +-- +-- Create replica instance, we're the master and +-- start it, no data to sync yet though +test_run:cmd("create server replica_slave with rpl_master=default, script='replication/replica-applier-rollback.lua'") +test_run:cmd("start server replica_slave") + +-- +-- Fill initial data on the master instance +test_run:cmd('switch default') + +_ = box.schema.space.create('test') +s = box.space.test + +s:format({{name = 'id', type = 'unsigned'}, {name = 'band_name', type = 'string'}}) + +_ = s:create_index('primary', {type = 'tree', parts = {'id'}}) +s:insert({1, '1'}) +s:insert({2, '2'}) +s:insert({3, '3'}) + +-- +-- Wait for data from master get propagated +test_run:wait_lsn('replica_slave', 'default') + +-- +-- Now inject error into slave instance +test_run:cmd('switch replica_slave') + +-- +-- To make sure we're running +box.info.status + +-- +-- To fail inserting new record. +errinj = box.error.injection +errinj.set('ERRINJ_TXN_COMMIT_ASYNC', true) + +-- +-- Jump back to master node and write new +-- entry which should cause error to happen +-- on slave instance +test_run:cmd('switch default') +s:insert({4, '4'}) + +-- +-- Wait for error to trigger +test_run:cmd('switch replica_slave') +fiber = require('fiber') +while test_run:grep_log('replica_slave', 'ER_INJECTION:[^\n]*') == nil do fiber.sleep(0.1) end + +---- +---- Such error cause the applier to be +---- cancelled and reaped, thus stop the +---- slave node and cleanup +test_run:cmd('switch default') + +-- +-- Cleanup +test_run:cmd("stop server replica_slave") +test_run:cmd("delete server replica_slave") +box.space.test:drop() +box.schema.user.revoke('guest', 'replication') diff --git a/test/replication/replica-applier-rollback.lua b/test/replication/replica-applier-rollback.lua new file mode 100644 index 000000000..26fb10055 --- /dev/null +++ b/test/replication/replica-applier-rollback.lua @@ -0,0 +1,16 @@ +-- +-- vim: ts=4 sw=4 et +-- + +print('arg', arg) + +box.cfg({ + replication = os.getenv("MASTER"), + listen = os.getenv("LISTEN"), + memtx_memory = 107374182, + replication_timeout = 0.1, + replication_connect_timeout = 0.5, + read_only = true, +}) + +require('console').listen(os.getenv('ADMIN')) diff --git a/test/replication/suite.cfg b/test/replication/suite.cfg index 90fd53ca6..a6abfd72c 100644 --- a/test/replication/suite.cfg +++ b/test/replication/suite.cfg @@ -16,6 +16,7 @@ "gh-4605-empty-password.test.lua": {}, "gh-4606-admin-creds.test.lua": {}, "gh-4739-vclock-assert.test.lua": {}, + "gh-4730-applier-rollback.test.lua": {}, "*": { "memtx": {"engine": "memtx"}, "vinyl": {"engine": "vinyl"} diff --git a/test/replication/suite.ini b/test/replication/suite.ini index b4e09744a..ac413669d 100644 --- a/test/replication/suite.ini +++ b/test/replication/suite.ini @@ -3,7 +3,7 @@ core = tarantool script = master.lua description = tarantool/box, replication disabled = consistent.test.lua -release_disabled = catch.test.lua errinj.test.lua gc.test.lua gc_no_space.test.lua before_replace.test.lua quorum.test.lua recover_missing_xlog.test.lua sync.test.lua long_row_timeout.test.lua gh-4739-vclock-assert.test.lua +release_disabled = catch.test.lua errinj.test.lua gc.test.lua gc_no_space.test.lua before_replace.test.lua quorum.test.lua recover_missing_xlog.test.lua sync.test.lua long_row_timeout.test.lua gh-4739-vclock-assert.test.lua gh-4730-applier-rollback.test.lua config = suite.cfg lua_libs = lua/fast_replica.lua lua/rlimit.lua use_unix_sockets = True -- 2.20.1