Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/regression-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ runs:
if [[ "${{inputs.epoll}}" == 'epoll' ]]; then
export FILTER="${{inputs.filter}} and not exclude_epoll"
# Run only replication tests with epoll
timeout 50m pytest -m "$FILTER" --durations=10 --timeout=300 --color=yes --json-report --json-report-file=report.json dragonfly --df force_epoll=true --log-cli-level=INFO || code=$?
timeout 60m pytest -m "$FILTER" --durations=10 --timeout=300 --color=yes --json-report --json-report-file=report.json dragonfly --df force_epoll=true --log-cli-level=INFO || code=$?
else
export FILTER="${{inputs.filter}}"
# Run only replication tests with epoll
timeout 50m pytest -m "$FILTER" --durations=10 --timeout=300 --color=yes --json-report --json-report-file=report.json dragonfly --log-cli-level=INFO || code=$?
timeout 60m pytest -m "$FILTER" --durations=10 --timeout=300 --color=yes --json-report --json-report-file=report.json dragonfly --log-cli-level=INFO || code=$?
fi

# timeout returns 124 if we exceeded the timeout duration
Expand Down
5 changes: 2 additions & 3 deletions tests/dragonfly/replication_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -2977,7 +2977,7 @@ async def test_bug_in_json_memory_tracking(df_factory: DflyInstanceFactory):
rand = random.randint(1, 4)
await c_master.execute_command(f"EXPIRE tmp:{i} {rand} NX")

seeder = SeederV2(key_target=100_000)
seeder = SeederV2(key_target=50_000)
fill_task = asyncio.create_task(seeder.run(master.client()))

for replica in c_replicas:
Expand All @@ -2989,7 +2989,6 @@ async def test_bug_in_json_memory_tracking(df_factory: DflyInstanceFactory):
await fill_task


@pytest.mark.skip("Skipped temporarily while being investigated")
async def test_replica_snapshot_with_big_values_while_seeding(df_factory: DflyInstanceFactory):
proactors = 4
master = df_factory.create(proactor_threads=proactors, dbfilename="")
Expand All @@ -2999,7 +2998,7 @@ async def test_replica_snapshot_with_big_values_while_seeding(df_factory: DflyIn
c_replica = replica.client()

# 50% big values
seeder_config = dict(key_target=20_000, huge_value_target=10000)
seeder_config = dict(key_target=8_000, huge_value_target=4_000)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok for this change, though I suspect it will not be stable for long because you check the side_saved. I suggest to follow up with a PR that will add a flag to yield on x buckets granularity in snapshot as we have in migration

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

# Fill instance with test data
seeder = SeederV2(**seeder_config)
await seeder.run(c_master, target_deviation=0.01)
Expand Down
Loading