Skip to content

Commit 6b3c912

Browse files
committed
fixes
1 parent 94955b6 commit 6b3c912

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

src/server/db_slice.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1370,7 +1370,6 @@ void DbSlice::RegisterWatchedKey(DbIndex db_indx, std::string_view key,
13701370
}
13711371

13721372
void DbSlice::UnregisterConnectionWatches(const ConnectionState::ExecInfo* exec_info) {
1373-
// Because we might remove while another fiber is preempted and miss a notification
13741373
for (const auto& [db_indx, key] : exec_info->watched_keys) {
13751374
auto& watched_keys = db_arr_[db_indx]->watched_keys;
13761375
if (auto it = watched_keys.find(key); it != watched_keys.end()) {

tests/dragonfly/instance.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,11 @@ def __init__(self, params: DflyParams, args):
124124
if threads > 1:
125125
self.args["num_shards"] = threads - 1
126126

127-
# Add 1 byte limit for big values
128-
self.args["serialization_max_chunk_size"] = 1
127+
if "disable_serialization_max_chunk_size" not in self.args:
128+
# Add 1 byte limit for big values
129+
self.args["serialization_max_chunk_size"] = 1
130+
else:
131+
self.args.pop("disable_serialization_max_chunk_size")
129132

130133
def __del__(self):
131134
assert self.proc == None

tests/dragonfly/replication_test.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2407,9 +2407,17 @@ async def test_replicate_old_master(
24072407

24082408
dfly_version = "v1.19.2"
24092409
released_dfly_path = download_dragonfly_release(dfly_version)
2410-
master = df_factory.create(version=1.19, path=released_dfly_path, cluster_mode=cluster_mode)
2410+
master = df_factory.create(
2411+
disable_serialization_max_chunk_size=0,
2412+
version=1.19,
2413+
path=released_dfly_path,
2414+
cluster_mode=cluster_mode,
2415+
)
24112416
replica = df_factory.create(
2412-
cluster_mode=cluster_mode, cluster_announce_ip=announce_ip, announce_port=announce_port
2417+
disable_serialization_max_chunk_size=0,
2418+
cluster_mode=cluster_mode,
2419+
cluster_announce_ip=announce_ip,
2420+
announce_port=announce_port,
24132421
)
24142422

24152423
df_factory.start_all([master, replica])

0 commit comments

Comments
 (0)