* [Tarantool-patches] [PATCH 1/1] test: fix to resolve box/net_msg_max flaky
@ 2020-12-04 18:21 Sergey Ostanevich
2020-12-04 23:01 ` Vladislav Shpilevoy
2020-12-08 22:16 ` Vladislav Shpilevoy
0 siblings, 2 replies; 5+ messages in thread
From: Sergey Ostanevich @ 2020-12-04 18:21 UTC (permalink / raw)
To: tarantool-patches
A problem was gh-4834-netbox-fiber-cancel left a request hanging
so the net_msg_max fails in case it follows on the same runner.
---
Branch: http://github.com/tarantool/tarantool/tree/sergos/gh-5013-followup
test/box/gh-4834-netbox-fiber-cancel.result | 7 ++++++-
test/box/gh-4834-netbox-fiber-cancel.test.lua | 5 ++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/test/box/gh-4834-netbox-fiber-cancel.result b/test/box/gh-4834-netbox-fiber-cancel.result
index 5af404e82..81adc4803 100644
--- a/test/box/gh-4834-netbox-fiber-cancel.result
+++ b/test/box/gh-4834-netbox-fiber-cancel.result
@@ -9,8 +9,12 @@ test_run = require('test_run').new()
| ---
| ...
+infinity = true
+ | ---
+ | ...
+
-- #4834: Cancelling fiber doesn't interrupt netbox operations
-function infinite_call() local channel = fiber.channel(1) pcall(channel:get()) channel.close() end
+function infinite_call() while infinity do fiber.sleep(0.01) end end
| ---
| ...
box.schema.func.create('infinite_call')
@@ -36,6 +40,7 @@ function netbox_runner()
fiber.yield()
f:cancel()
f:join()
+ infinity = false
cn:close()
end;
| ---
diff --git a/test/box/gh-4834-netbox-fiber-cancel.test.lua b/test/box/gh-4834-netbox-fiber-cancel.test.lua
index 59963ba91..2c7cba2dd 100644
--- a/test/box/gh-4834-netbox-fiber-cancel.test.lua
+++ b/test/box/gh-4834-netbox-fiber-cancel.test.lua
@@ -2,8 +2,10 @@ remote = require('net.box')
fiber = require('fiber')
test_run = require('test_run').new()
+infinity = true
+
-- #4834: Cancelling fiber doesn't interrupt netbox operations
-function infinite_call() local channel = fiber.channel(1) pcall(channel:get()) channel.close() end
+function infinite_call() while infinity do fiber.sleep(0.01) end end
box.schema.func.create('infinite_call')
box.schema.user.grant('guest', 'execute', 'function', 'infinite_call')
@@ -18,6 +20,7 @@ function netbox_runner()
fiber.yield()
f:cancel()
f:join()
+ infinity = false
cn:close()
end;
test_run:cmd("setopt delimiter ''");
--
2.24.3 (Apple Git-128)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Tarantool-patches] [PATCH 1/1] test: fix to resolve box/net_msg_max flaky
2020-12-04 18:21 [Tarantool-patches] [PATCH 1/1] test: fix to resolve box/net_msg_max flaky Sergey Ostanevich
@ 2020-12-04 23:01 ` Vladislav Shpilevoy
2020-12-07 7:50 ` Sergey Ostanevich
2020-12-08 10:50 ` Alexander V. Tikhonov
2020-12-08 22:16 ` Vladislav Shpilevoy
1 sibling, 2 replies; 5+ messages in thread
From: Vladislav Shpilevoy @ 2020-12-04 23:01 UTC (permalink / raw)
To: Sergey Ostanevich, tarantool-patches, Alexander V. Tikhonov
Hi! Thanks for the patch!
On 04.12.2020 19:21, Sergey Ostanevich via Tarantool-patches wrote:
>
> A problem was gh-4834-netbox-fiber-cancel left a request hanging
> so the net_msg_max fails in case it follows on the same runner.
Please, add 'Follow-up #5013' line here.
> ---
> Branch: http://github.com/tarantool/tarantool/tree/sergos/gh-5013-followup
Sasha, please, tell if we can push this.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Tarantool-patches] [PATCH 1/1] test: fix to resolve box/net_msg_max flaky
2020-12-04 23:01 ` Vladislav Shpilevoy
@ 2020-12-07 7:50 ` Sergey Ostanevich
2020-12-08 10:50 ` Alexander V. Tikhonov
1 sibling, 0 replies; 5+ messages in thread
From: Sergey Ostanevich @ 2020-12-07 7:50 UTC (permalink / raw)
To: Vladislav Shpilevoy; +Cc: tarantool-patches
> On 5 Dec 2020, at 02:01, Vladislav Shpilevoy <v.shpilevoy@tarantool.org> wrote:
>
> Hi! Thanks for the patch!
>
> On 04.12.2020 19:21, Sergey Ostanevich via Tarantool-patches wrote:
>>
>> A problem was gh-4834-netbox-fiber-cancel left a request hanging
>> so the net_msg_max fails in case it follows on the same runner.
>
> Please, add 'Follow-up #5013' line here.
Done, force-pushsed.
>
>> ---
>> Branch: http://github.com/tarantool/tarantool/tree/sergos/gh-5013-followup
>
> Sasha, please, tell if we can push this.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Tarantool-patches] [PATCH 1/1] test: fix to resolve box/net_msg_max flaky
2020-12-04 23:01 ` Vladislav Shpilevoy
2020-12-07 7:50 ` Sergey Ostanevich
@ 2020-12-08 10:50 ` Alexander V. Tikhonov
1 sibling, 0 replies; 5+ messages in thread
From: Alexander V. Tikhonov @ 2020-12-08 10:50 UTC (permalink / raw)
To: Vladislav Shpilevoy; +Cc: tarantool-patches
Hi Sergey, thanks for the patch, as I see no new degradation found in
gitlab-ci testing commit criteria pipeline [1], patch LGTM.
[1] - https://gitlab.com/tarantool/tarantool/-/pipelines/226095607
On Sat, Dec 05, 2020 at 12:01:34AM +0100, Vladislav Shpilevoy wrote:
> Hi! Thanks for the patch!
>
> On 04.12.2020 19:21, Sergey Ostanevich via Tarantool-patches wrote:
> >
> > A problem was gh-4834-netbox-fiber-cancel left a request hanging
> > so the net_msg_max fails in case it follows on the same runner.
>
> Please, add 'Follow-up #5013' line here.
>
> > ---
> > Branch: http://github.com/tarantool/tarantool/tree/sergos/gh-5013-followup
>
> Sasha, please, tell if we can push this.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Tarantool-patches] [PATCH 1/1] test: fix to resolve box/net_msg_max flaky
2020-12-04 18:21 [Tarantool-patches] [PATCH 1/1] test: fix to resolve box/net_msg_max flaky Sergey Ostanevich
2020-12-04 23:01 ` Vladislav Shpilevoy
@ 2020-12-08 22:16 ` Vladislav Shpilevoy
1 sibling, 0 replies; 5+ messages in thread
From: Vladislav Shpilevoy @ 2020-12-08 22:16 UTC (permalink / raw)
To: Sergey Ostanevich, tarantool-patches
Pushed to master, 2.6, 2.5, and 1.10.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-12-08 22:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-04 18:21 [Tarantool-patches] [PATCH 1/1] test: fix to resolve box/net_msg_max flaky Sergey Ostanevich
2020-12-04 23:01 ` Vladislav Shpilevoy
2020-12-07 7:50 ` Sergey Ostanevich
2020-12-08 10:50 ` Alexander V. Tikhonov
2020-12-08 22:16 ` Vladislav Shpilevoy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox