Skip to content

Commit

Permalink
fix: skip the new flag for older version of dragonfly
Browse files Browse the repository at this point in the history
  • Loading branch information
vyavdoshenko committed Mar 5, 2025
1 parent 11633bc commit 3735829
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
7 changes: 5 additions & 2 deletions tests/dragonfly/instance.py
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,9 @@ def __init__(self, params: DflyParams, args):
self.params = params
self.instances = []

def create(self, existing_port=None, path=None, version=100, **kwargs) -> DflyInstance:
def create(
self, existing_port=None, path=None, version=100, use_skip_basic_usage_flag=True, **kwargs
) -> DflyInstance:
args = {**self.args, **kwargs}
args.setdefault("dbfilename", "")
args.setdefault("noversion_check", None)
Expand All @@ -420,7 +422,8 @@ def create(self, existing_port=None, path=None, version=100, **kwargs) -> DflyIn
vmod = "dragonfly_connection=1,accept_server=1,listener_interface=1,main_service=1,rdb_save=1,replica=1,cluster_family=1,proactor_pool=1,dflycmd=1,snapshot=1,streamer=1"
args.setdefault("vmodule", vmod)
args.setdefault("jsonpathv2")
args.setdefault("skip_basic_usage")
if use_skip_basic_usage_flag:
args.setdefault("skip_basic_usage")

# If path is not set, we assume that we are running the latest dragonfly.
if not path:
Expand Down
10 changes: 8 additions & 2 deletions tests/dragonfly/replication_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -2428,6 +2428,7 @@ async def test_replicate_old_master(
version=1.19,
path=released_dfly_path,
cluster_mode=cluster_mode,
use_skip_basic_usage_flag=False,
)
replica = df_factory.create(
cluster_mode=cluster_mode,
Expand Down Expand Up @@ -2467,7 +2468,10 @@ async def test_empty_hash_map_replicate_old_master(df_factory):
dfly_version = "v1.21.2"
released_dfly_path = download_dragonfly_release(dfly_version)
# old versions
instances = [df_factory.create(path=released_dfly_path, version=1.21) for i in range(3)]
instances = [
df_factory.create(path=released_dfly_path, version=1.21, use_skip_basic_usage_flag=False)
for i in range(3)
]
# new version
instances.append(df_factory.create())

Expand Down Expand Up @@ -2525,7 +2529,9 @@ async def test_empty_hashmap_loading_bug(df_factory: DflyInstanceFactory):
dfly_version = "v1.21.2"
released_dfly_path = download_dragonfly_release(dfly_version)

master = df_factory.create(path=released_dfly_path, version=1.21)
master = df_factory.create(
path=released_dfly_path, version=1.21, use_skip_basic_usage_flag=False
)
master.start()

c_master = master.client()
Expand Down

0 comments on commit 3735829

Please sign in to comment.