From: Georgy Kirichenko <georgy@tarantool.org>
To: tarantool-patches@freelists.org
Cc: Georgy Kirichenko <georgy@tarantool.org>
Subject: [tarantool-patches] [PATCH v5 7/7] test: fix flaky test
Date: Sat, 22 Jun 2019 00:48:21 +0300 [thread overview]
Message-ID: <81a4972f56a62ca54f1a99c0dd99295da2394f59.1561153472.git.georgy@tarantool.org> (raw)
In-Reply-To: <cover.1561153472.git.georgy@tarantool.org>
This test fails sporadically
---
test/replication/sync.result | 7 +++++--
test/replication/sync.test.lua | 4 ++--
test/replication/transaction.result | 16 +++++++++++++++-
test/replication/transaction.test.lua | 7 ++++++-
4 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/test/replication/sync.result b/test/replication/sync.result
index eddc7cbc8..6b5a14d3f 100644
--- a/test/replication/sync.result
+++ b/test/replication/sync.result
@@ -46,7 +46,7 @@ function fill()
box.space.test:replace{i}
end
fiber.create(function()
- box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0.1)
+ box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0.0025)
test_run:wait_cond(function()
local r = box.info.replication[2]
return r ~= nil and r.downstream ~= nil and
@@ -55,7 +55,6 @@ function fill()
for i = count + 101, count + 200 do
box.space.test:replace{i}
end
- box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0)
end)
count = count + 200
end;
@@ -250,6 +249,10 @@ test_run:cmd("switch default")
---
- true
...
+box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0)
+---
+- ok
+...
box.error.injection.set('ERRINJ_WAL_DELAY', true)
---
- ok
diff --git a/test/replication/sync.test.lua b/test/replication/sync.test.lua
index 52ce88fe2..f0f530ad4 100644
--- a/test/replication/sync.test.lua
+++ b/test/replication/sync.test.lua
@@ -30,7 +30,7 @@ function fill()
box.space.test:replace{i}
end
fiber.create(function()
- box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0.1)
+ box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0.0025)
test_run:wait_cond(function()
local r = box.info.replication[2]
return r ~= nil and r.downstream ~= nil and
@@ -39,7 +39,6 @@ function fill()
for i = count + 101, count + 200 do
box.space.test:replace{i}
end
- box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0)
end)
count = count + 200
end;
@@ -136,6 +135,7 @@ box.cfg{replication_sync_lag = 1}
box.cfg{replication_sync_timeout = 10}
test_run:cmd("switch default")
+box.error.injection.set('ERRINJ_RELAY_TIMEOUT', 0)
box.error.injection.set('ERRINJ_WAL_DELAY', true)
test_run:cmd("setopt delimiter ';'")
_ = fiber.create(function()
diff --git a/test/replication/transaction.result b/test/replication/transaction.result
index 8c2ac6ee4..c54c1e8d5 100644
--- a/test/replication/transaction.result
+++ b/test/replication/transaction.result
@@ -7,12 +7,21 @@ test_run = env.new()
box.schema.user.grant('guest', 'replication')
---
...
-s = box.schema.space.create('test', {engine = test_run:get_cfg('engine')})
+engine = test_run:get_cfg('engine')
+---
+...
+s = box.schema.space.create('test', {engine = engine})
---
...
_ = s:create_index('pk')
---
...
+l = box.schema.space.create('l_space', {engine = engine, is_local = true})
+---
+...
+_ = l:create_index('pk')
+---
+...
-- transaction w/o conflict
box.begin() s:insert({1, 'm'}) s:insert({2, 'm'}) box.commit()
---
@@ -92,6 +101,11 @@ box.cfg{replication = replication}
---
...
-- replication stopped of third transaction
+-- flush wal
+box.space.l_space:replace({1})
+---
+- [1]
+...
v1[1] + 2 == box.info.vclock[1]
---
- true
diff --git a/test/replication/transaction.test.lua b/test/replication/transaction.test.lua
index f25a4737d..4e0323128 100644
--- a/test/replication/transaction.test.lua
+++ b/test/replication/transaction.test.lua
@@ -1,9 +1,12 @@
env = require('test_run')
test_run = env.new()
box.schema.user.grant('guest', 'replication')
+engine = test_run:get_cfg('engine')
-s = box.schema.space.create('test', {engine = test_run:get_cfg('engine')})
+s = box.schema.space.create('test', {engine = engine})
_ = s:create_index('pk')
+l = box.schema.space.create('l_space', {engine = engine, is_local = true})
+_ = l:create_index('pk')
-- transaction w/o conflict
box.begin() s:insert({1, 'm'}) s:insert({2, 'm'}) box.commit()
@@ -37,6 +40,8 @@ replication = box.cfg.replication
box.cfg{replication = {}}
box.cfg{replication = replication}
-- replication stopped of third transaction
+-- flush wal
+box.space.l_space:replace({1})
v1[1] + 2 == box.info.vclock[1]
box.space.test:select()
-- check replication status
--
2.22.0
next prev parent reply other threads:[~2019-06-21 21:48 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-21 21:48 [tarantool-patches] [PATCH v5 0/7] Parallel applier Georgy Kirichenko
2019-06-21 21:48 ` [tarantool-patches] [PATCH v5 1/7] txn: unref statement at txn_free Georgy Kirichenko
2019-06-21 21:48 ` [tarantool-patches] [PATCH v5 2/7] txn: get rid of autocommit from a txn structure Georgy Kirichenko
2019-06-21 21:48 ` [tarantool-patches] [PATCH v5 3/7] txn: get rid of fiber_gc from txn_rollback Georgy Kirichenko
2019-06-21 21:48 ` [tarantool-patches] [PATCH v5 4/7] wal: introduce a journal entry finalization callback Georgy Kirichenko
2019-06-21 21:48 ` [tarantool-patches] [PATCH v5 5/7] txn: introduce asynchronous txn commit Georgy Kirichenko
2019-06-21 21:48 ` [tarantool-patches] [PATCH v5 6/7] applier: apply transaction in parallel Georgy Kirichenko
2019-06-21 21:48 ` Georgy Kirichenko [this message]
2019-06-25 16:08 ` [tarantool-patches] [PATCH v5 0/7] Parallel applier Vladimir Davydov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=81a4972f56a62ca54f1a99c0dd99295da2394f59.1561153472.git.georgy@tarantool.org \
--to=georgy@tarantool.org \
--cc=tarantool-patches@freelists.org \
--subject='Re: [tarantool-patches] [PATCH v5 7/7] test: fix flaky test' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox