gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Change the shared format for dual channel replication logs (#1586)

Browse Source 
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 <ranshid@amazon.com>
This commit is contained in:
ranshid 2025-01-20 08:04:47 +02:00 committed by GitHub
parent b2e4155f54
commit 3032ccd48a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/server.h
View File

@ -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__)

2
tests/integration/dual-channel-replication.tcl
View File

@ -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
}
}
}