Tarantool development patches archive
 help / color / mirror / Atom feed
From: "Alexander Tikhonov" <avtikhon@tarantool.org>
To: "Ilya Kosarev" <i.kosarev@tarantool.org>
Cc: v.shpilevoy@tarantool.org, tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches] [PATCH] test: fix flaky join_vclock test
Date: Fri, 13 Dec 2019 22:36:57 +0300	[thread overview]
Message-ID: <1576265817.386366442@f304.i.mail.ru> (raw)
In-Reply-To: <20191213190514.25903-1-i.kosarev@tarantool.org>

[-- Attachment #1: Type: text/plain, Size: 2436 bytes --]

From my side the fix is needed and the patch LGTM.


>Пятница, 13 декабря 2019, 22:05 +03:00 от Ilya Kosarev <i.kosarev@tarantool.org>:
>
>Under high load we might need to wait for all tuples to get to replica.
>With apllied fixes join_vclock test is not fragile anymore.
>
>Closes #4160
>---
>Branch:  https://github.com/tarantool/tarantool/tree/i.kosarev/gh-4160-fix-join-vclock-test
>Issue:  https://github.com/tarantool/tarantool/issues/4160
>
> test/replication/join_vclock.result   | 5 +----
> test/replication/join_vclock.test.lua | 3 +--
> test/replication/suite.ini            | 1 -
> 3 files changed, 2 insertions(+), 7 deletions(-)
>
>diff --git a/test/replication/join_vclock.result b/test/replication/join_vclock.result
>index a9781073d44..eb05f1f1a02 100644
>--- a/test/replication/join_vclock.result
>+++ b/test/replication/join_vclock.result
>@@ -67,10 +67,7 @@ test_run:cmd("switch replica1")
> ---
> - true
> ...
>-cnt = box.space.test.index[0]:count()
>----
>-...
>-box.space.test.index.primary:max()[1] == cnt - 1
>+test_run:wait_cond(function() return box.space.test.index.primary:max()[1] == box.space.test.index.primary:count() - 1 end, 10)
> ---
> - true
> ...
>diff --git a/test/replication/join_vclock.test.lua b/test/replication/join_vclock.test.lua
>index 0b60dffc2c0..08c3a26442b 100644
>--- a/test/replication/join_vclock.test.lua
>+++ b/test/replication/join_vclock.test.lua
>@@ -26,8 +26,7 @@ ch:get()
> 
> errinj.set("ERRINJ_RELAY_FINAL_SLEEP", false)
> test_run:cmd("switch replica1")
>-cnt = box.space.test.index[0]:count()
>-box.space.test.index.primary:max()[1] == cnt - 1
>+test_run:wait_cond(function() return box.space.test.index.primary:max()[1] == box.space.test.index.primary:count() - 1 end, 10)
> test_run:cmd("switch default")
> 
> replica_set.drop_all(test_run)
>diff --git a/test/replication/suite.ini b/test/replication/suite.ini
>index 384dac677ea..ed1de31405e 100644
>--- a/test/replication/suite.ini
>+++ b/test/replication/suite.ini
>@@ -12,7 +12,6 @@ long_run = prune.test.lua
> is_parallel = True
> pretest_clean = True
> fragile = errinj.test.lua            ; gh-3870
>-          join_vclock.test.lua       ; gh-4160
>           long_row_timeout.test.lua  ; gh-4351
>           skip_conflict_row.test.lua ; gh-4457
>           sync.test.lua              ; gh-3835 gh-3877
>-- 
>2.17.1
>


-- 
Alexander Tikhonov

[-- Attachment #2: Type: text/html, Size: 3391 bytes --]

  reply	other threads:[~2019-12-13 19:36 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-13 19:05 Ilya Kosarev
2019-12-13 19:36 ` Alexander Tikhonov [this message]
2019-12-13 19:55 Ilya Kosarev

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=1576265817.386366442@f304.i.mail.ru \
    --to=avtikhon@tarantool.org \
    --cc=i.kosarev@tarantool.org \
    --cc=tarantool-patches@dev.tarantool.org \
    --cc=v.shpilevoy@tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH] test: fix flaky join_vclock 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