Skip to content

Commit

Permalink
Change the shared format for dual channel replication logs (valkey-io…
Browse files Browse the repository at this point in the history
…#1586)

change the format of the dual channel replication logs so that it will
not
conflict with existing log formats like modules. 

Fixes: valkey-io#1509

Signed-off-by: Ran Shidlansik <[email protected]>
  • Loading branch information
ranshid authored Jan 20, 2025
1 parent b2e4155 commit 3032ccd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/server.h
Original file line number Diff line number Diff line change
Expand Up @@ -3915,7 +3915,7 @@ void debugPauseProcess(void);
/* dualChannelServerLog - Log messages related to dual-channel operations
* This macro wraps the serverLog function, prepending "<Dual Channel>"
* to the log message. */
#define dualChannelServerLog(level, ...) serverLog(level, "<Dual Channel> " __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__)
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/dual-channel-replication.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -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 {"*<Dual Channel> Psync established after rdb load*"} 0 2000 1
wait_for_log_messages -1 {"*Dual channel replication: Psync established after rdb load*"} 0 2000 1
}
}
}
Expand Down

0 comments on commit 3032ccd

Please sign in to comment.