mirrors/dragonflydb-dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2024-12-14 11:58:02 +00:00
Code Activity

fix(tests): increase interpreter test load, lower notice limit, include 2553 (#2554)

Browse source 
* fix: increase load + lower notice limit

* chore: include 2553

* fix: lower metric EVEN more

Signed-off-by: Vladislav Oleshko <vlad@dragonflydb.io>

---------

Signed-off-by: Vladislav Oleshko <vlad@dragonflydb.io>
This commit is contained in:
Vladislav 2024-02-06 17:57:32 +03:00 committed by GitHub
parent 83a12b99c6
commit ed59a439d1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/server/list_family.cc
View file

@ -783,6 +783,7 @@ void BRPopLPush(CmdArgList args, ConnectionContext* cntx) {
}
switch (op_res.status()) {
case OpStatus::CANCELLED:
case OpStatus::TIMED_OUT:
return rb->SendNull();
break;
@ -825,6 +826,7 @@ void BLMove(CmdArgList args, ConnectionContext* cntx) {
}
switch (op_res.status()) {
case OpStatus::CANCELLED:
case OpStatus::TIMED_OUT:
return rb->SendNull();
break;

22
tests/dragonfly/eval_test.py
View file

@ -274,24 +274,20 @@ Ensure liveness even with only a single interpreter in scenarios where EVAL and
"""
@dfly_args({"proactor_threads": 3, "interpreter_per_thread": 1})
@dfly_args({"proactor_threads": 2, "interpreter_per_thread": 1})
async def test_one_interpreter(async_client: aioredis.Redis):
sha = await async_client.script_load("redis.call('GET', KEYS[1])")
all_keys = [string.ascii_lowercase[i] for i in range(5)]
total_commands = 100
total_runs = 100
async def run_multi():
for _ in range(total_commands):
p = async_client.pipeline(transaction=True)
async def run(transaction):
for _ in range(total_runs):
p = async_client.pipeline(transaction=transaction)
pkeys = random.choices(all_keys, k=3)
for key in pkeys:
p.evalsha(sha, 1, key)
await p.execute()
async def run_single():
for _ in range(total_commands):
await async_client.evalsha(sha, 1, random.choice(all_keys))
max_blocked = 0
async def measure_blocked():
@ -302,8 +298,8 @@ async def test_one_interpreter(async_client: aioredis.Redis):
)
await asyncio.sleep(0.01)
tm = [asyncio.create_task(run_multi()) for _ in range(5)]
ts = [asyncio.create_task(run_single()) for _ in range(5)]
tm = [asyncio.create_task(run(True)) for _ in range(10)]
ts = [asyncio.create_task(run(False)) for _ in range(10)]
block_measure = asyncio.create_task(measure_blocked())
async with async_timeout.timeout(5):
@ -311,5 +307,5 @@ async def test_one_interpreter(async_client: aioredis.Redis):
block_measure.cancel()
# At least some of the commands were seen blocking on the interpreter
assert max_blocked > 3
# At least some connection was seen blocked
assert max_blocked > 0