<HTML><BODY><p>LGTM.<br><br>I've checked the change in sources and the fix way seems reasonable,</p><p> also the branch I've checked running under high load and all tests passed.</p><p><br></p><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;">
Вторник, 17 сентября 2019, 15:29 +03:00 от Ilya Kosarev <i.kosarev@tarantool.org>:<br>
<br>
<div id="">
<div class="js-helper js-readmsg-msg">
<style type="text/css"></style>
<div>
<div id="style_15687233681993573359_BODY">xlog/panic_on_broken_lsn includes waiting for replica and then<br>
box.info.vclock usage. Sometimes box.info.vclock was giving wrong<br>
values. Now it is stable due to improved replica expectation<br>
criterion.<br>
<br>
Closes #4508<br>
---<br>
Branch: <a href="https://github.com/tarantool/tarantool/tree/i.kosarev/gh-4508-fix-broken-lsn-test" target="_blank">https://github.com/tarantool/tarantool/tree/i.kosarev/gh-4508-fix-broken-lsn-test</a><br>
Issue: <a href="https://github.com/tarantool/tarantool/issues/4508" target="_blank">https://github.com/tarantool/tarantool/issues/4508</a><br>
<br>
test/xlog/panic_on_broken_lsn.result | 2 +-<br>
test/xlog/panic_on_broken_lsn.test.lua | 2 +-<br>
2 files changed, 2 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/test/xlog/panic_on_broken_lsn.result b/test/xlog/panic_on_broken_lsn.result<br>
index 60283281d..1e62680eb 100644<br>
--- a/test/xlog/panic_on_broken_lsn.result<br>
+++ b/test/xlog/panic_on_broken_lsn.result<br>
@@ -139,7 +139,7 @@ test_run:cmd("setopt delimiter ';'")<br>
- true<br>
...<br>
_ = fiber.create(function()<br>
- test_run:wait_cond(function() return box.space._cluster:get(2) ~= nil end)<br>
+ test_run:wait_cond(function() return box.info.replication[2] ~= nil end)<br>
lsn = box.info.vclock[1]<br>
box.error.injection.set("ERRINJ_RELAY_BREAK_LSN", lsn + 1)<br>
box.space.test:auto_increment{'v1'}<br>
diff --git a/test/xlog/panic_on_broken_lsn.test.lua b/test/xlog/panic_on_broken_lsn.test.lua<br>
index ca3043458..80cccd918 100644<br>
--- a/test/xlog/panic_on_broken_lsn.test.lua<br>
+++ b/test/xlog/panic_on_broken_lsn.test.lua<br>
@@ -65,7 +65,7 @@ box.error.injection.set("ERRINJ_REPLICA_JOIN_DELAY", true)<br>
fiber = require('fiber')<br>
test_run:cmd("setopt delimiter ';'")<br>
_ = fiber.create(function()<br>
- test_run:wait_cond(function() return box.space._cluster:get(2) ~= nil end)<br>
+ test_run:wait_cond(function() return box.info.replication[2] ~= nil end)<br>
lsn = box.info.vclock[1]<br>
box.error.injection.set("ERRINJ_RELAY_BREAK_LSN", lsn + 1)<br>
box.space.test:auto_increment{'v1'}<br>
-- <br>
2.17.1<br>
<br>
<br>
</div>
</div>
</div>
</div>
</blockquote>
<br>
<br>-- <br>Alexander Tikhonov<br></BODY></HTML>