From 3032ccd48a17f9da78799dea0f8f976ee4312531 Mon Sep 17 00:00:00 2001 From: ranshid <88133677+ranshid@users.noreply.github.com> Date: Mon, 20 Jan 2025 08:04:47 +0200 Subject: [PATCH] Change the shared format for dual channel replication logs (#1586) change the format of the dual channel replication logs so that it will not conflict with existing log formats like modules. Fixes: https://github.com/valkey-io/valkey/issues/1509 Signed-off-by: Ran Shidlansik --- src/server.h | 2 +- tests/integration/dual-channel-replication.tcl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server.h b/src/server.h index 29cbdc5c65..8f4fb6a6b4 100644 --- a/src/server.h +++ b/src/server.h @@ -3915,7 +3915,7 @@ void debugPauseProcess(void); /* dualChannelServerLog - Log messages related to dual-channel operations * This macro wraps the serverLog function, prepending "" * to the log message. */ -#define dualChannelServerLog(level, ...) serverLog(level, " " __VA_ARGS__) +#define dualChannelServerLog(level, ...) serverLog(level, "Dual channel replication: " __VA_ARGS__) #define serverDebug(fmt, ...) printf("DEBUG %s:%d > " fmt "\n", __FILE__, __LINE__, __VA_ARGS__) #define serverDebugMark() printf("-- MARK %s:%d --\n", __FILE__, __LINE__) diff --git a/tests/integration/dual-channel-replication.tcl b/tests/integration/dual-channel-replication.tcl index ec6783c1c9..dc0de5a734 100644 --- a/tests/integration/dual-channel-replication.tcl +++ b/tests/integration/dual-channel-replication.tcl @@ -487,7 +487,7 @@ start_server {tags {"dual-channel-replication external:skip"}} { } wait_for_value_to_propagate_to_replica $primary $replica "key1" # Confirm the occurrence of a race condition. - wait_for_log_messages -1 {"* Psync established after rdb load*"} 0 2000 1 + wait_for_log_messages -1 {"*Dual channel replication: Psync established after rdb load*"} 0 2000 1 } } }