From 79ca6128131b63be31357bd9fedb6d5534f5bcde Mon Sep 17 00:00:00 2001 From: Shivshankar-Reddy Date: Fri, 26 Apr 2024 14:51:52 +0000 Subject: [PATCH 1/7] Rename redis in aof logs Signed-off-by: Shivshankar-Reddy --- src/aof.c | 14 +++++++------- src/cluster_legacy.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/aof.c b/src/aof.c index cb3d83c0cf..ff70b385e3 100644 --- a/src/aof.c +++ b/src/aof.c @@ -996,7 +996,7 @@ int startAppendOnly(void) { if (rewriteAppendOnlyFileBackground() == C_ERR) { server.aof_state = AOF_OFF; - serverLog(LL_WARNING,"Redis needs to enable the AOF but can't trigger a background AOF rewrite operation. Check the above logs for more info about the error."); + serverLog(LL_WARNING,"Server needs to enable the AOF but can't trigger a background AOF rewrite operation. Check the above logs for more info about the error."); return C_ERR; } } @@ -1121,7 +1121,7 @@ void flushAppendOnlyFile(int force) { /* Otherwise fall through, and go write since we can't wait * over two seconds. */ server.aof_delayed_fsync++; - serverLog(LL_NOTICE,"Asynchronous AOF fsync is taking too long (disk is busy?). Writing the AOF buffer without waiting for fsync to complete, this may slow down Redis."); + serverLog(LL_NOTICE,"Asynchronous AOF fsync is taking too long (disk is busy?). Writing the AOF buffer without waiting for fsync to complete, this may slow down the server."); } } /* We want to perform a single write. This should be guaranteed atomic @@ -1183,7 +1183,7 @@ void flushAppendOnlyFile(int force) { if (ftruncate(server.aof_fd, server.aof_last_incr_size) == -1) { if (can_log) { serverLog(LL_WARNING, "Could not remove short write " - "from the append-only file. Redis may refuse " + "from the append-only file. Server may refuse " "to load the AOF the next time it starts. " "ftruncate: %s", strerror(errno)); } @@ -1224,7 +1224,7 @@ void flushAppendOnlyFile(int force) { * OK state and log the event. */ if (server.aof_last_write_status == C_ERR) { serverLog(LL_NOTICE, - "AOF write error looks solved, Redis can write again."); + "AOF write error looks solved, Server can write again."); server.aof_last_write_status = C_OK; } } @@ -1634,14 +1634,14 @@ int loadSingleAppendOnlyFile(char *filename) { } } serverLog(LL_WARNING, "Unexpected end of file reading the append only file %s. You can: " - "1) Make a backup of your AOF file, then use ./redis-check-aof --fix . " + "1) Make a backup of your AOF file, then use ./valkey-check-aof --fix . " "2) Alternatively you can set the 'aof-load-truncated' configuration option to yes and restart the server.", filename); ret = AOF_FAILED; goto cleanup; fmterr: /* Format error. */ serverLog(LL_WARNING, "Bad file format reading the append only file %s: " - "make a backup of your AOF file, then use ./redis-check-aof --fix ", filename); + "make a backup of your AOF file, then use ./valkey-check-aof --fix ", filename); ret = AOF_FAILED; /* fall through to cleanup. */ @@ -2471,7 +2471,7 @@ int rewriteAppendOnlyFileBackground(void) { char tmpfile[256]; /* Child */ - serverSetProcTitle("redis-aof-rewrite"); + serverSetProcTitle("valkey-aof-rewrite"); serverSetCpuAffinity(server.aof_rewrite_cpulist); snprintf(tmpfile,256,"temp-rewriteaof-bg-%d.aof", (int) getpid()); if (rewriteAppendOnlyFile(tmpfile) == C_OK) { diff --git a/src/cluster_legacy.c b/src/cluster_legacy.c index 3e7e40c8a2..6754a0b8e0 100644 --- a/src/cluster_legacy.c +++ b/src/cluster_legacy.c @@ -808,7 +808,7 @@ int clusterLockConfig(char *filename) { * we need save `fd` to `cluster_config_file_lock_fd`, so that in serverFork(), * it will be closed in the child process. * If it is not closed, when the main process is killed -9, but the child process - * (redis-aof-rewrite) is still alive, the fd(lock) will still be held by the + * (valkey-aof-rewrite) is still alive, the fd(lock) will still be held by the * child process, and the main process will fail to get lock, means fail to start. */ server.cluster_config_file_lock_fd = fd; #else From 54ac594e660bb4308ab5410fd101cdd3bfd89c72 Mon Sep 17 00:00:00 2001 From: Shivshankar-Reddy Date: Mon, 29 Apr 2024 19:21:49 +0000 Subject: [PATCH 2/7] correct log statement Signed-off-by: Shivshankar-Reddy --- src/aof.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/aof.c b/src/aof.c index ff70b385e3..72daf1bc2b 100644 --- a/src/aof.c +++ b/src/aof.c @@ -996,7 +996,7 @@ int startAppendOnly(void) { if (rewriteAppendOnlyFileBackground() == C_ERR) { server.aof_state = AOF_OFF; - serverLog(LL_WARNING,"Server needs to enable the AOF but can't trigger a background AOF rewrite operation. Check the above logs for more info about the error."); + serverLog(LL_WARNING,"The server needs to enable the AOF but can't trigger a background AOF rewrite operation. Check the above logs for more info about the error."); return C_ERR; } } From 64095cfa1a8a3e02f19cd68d5e76df4b63932e5b Mon Sep 17 00:00:00 2001 From: Shivshankar-Reddy Date: Mon, 29 Apr 2024 19:32:04 +0000 Subject: [PATCH 3/7] update all logs Signed-off-by: Shivshankar-Reddy --- src/aof.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/aof.c b/src/aof.c index 72daf1bc2b..e13d8a65f8 100644 --- a/src/aof.c +++ b/src/aof.c @@ -1183,7 +1183,7 @@ void flushAppendOnlyFile(int force) { if (ftruncate(server.aof_fd, server.aof_last_incr_size) == -1) { if (can_log) { serverLog(LL_WARNING, "Could not remove short write " - "from the append-only file. Server may refuse " + "from the append-only file. The server may refuse " "to load the AOF the next time it starts. " "ftruncate: %s", strerror(errno)); } @@ -1224,7 +1224,7 @@ void flushAppendOnlyFile(int force) { * OK state and log the event. */ if (server.aof_last_write_status == C_ERR) { serverLog(LL_NOTICE, - "AOF write error looks solved, Server can write again."); + "AOF write error looks solved, The server can write again."); server.aof_last_write_status = C_OK; } } From c27cb4cb236ed3a1491e64542ba9cb823788294f Mon Sep 17 00:00:00 2001 From: Shivshankar-Reddy Date: Tue, 30 Apr 2024 17:06:49 +0000 Subject: [PATCH 4/7] update proc name based on symlink Signed-off-by: Shivshankar-Reddy --- src/aof.c | 6 +++++- src/server.c | 6 ++++++ src/server.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/aof.c b/src/aof.c index e13d8a65f8..58dceb5156 100644 --- a/src/aof.c +++ b/src/aof.c @@ -2471,7 +2471,11 @@ int rewriteAppendOnlyFileBackground(void) { char tmpfile[256]; /* Child */ - serverSetProcTitle("valkey-aof-rewrite"); + if (server.server_symlink) { + serverSetProcTitle("redis-aof-rewrite"); + } else { + serverSetProcTitle("valkey-aof-rewrite"); + } serverSetCpuAffinity(server.aof_rewrite_cpulist); snprintf(tmpfile,256,"temp-rewriteaof-bg-%d.aof", (int) getpid()); if (rewriteAppendOnlyFile(tmpfile) == C_OK) { diff --git a/src/server.c b/src/server.c index 02191da785..34b2f0eb0c 100644 --- a/src/server.c +++ b/src/server.c @@ -6992,6 +6992,12 @@ int main(int argc, char **argv) { char *exec_name = strrchr(argv[0], '/'); if (exec_name == NULL) exec_name = argv[0]; server.sentinel_mode = checkForSentinelMode(argc,argv, exec_name); + if (strstr(exec_name,"redis-server") != NULL) { + server.server_symlink = true; + } else { + server.server_symlink = false; + } + initServerConfig(); ACLInit(); /* The ACL subsystem must be initialized ASAP because the basic networking code and client creation depends on it. */ diff --git a/src/server.h b/src/server.h index ea7f9c0ef2..da287e01bf 100644 --- a/src/server.h +++ b/src/server.h @@ -2073,6 +2073,7 @@ struct valkeyServer { int reply_buffer_resizing_enabled; /* Is reply buffer resizing enabled (1 by default) */ /* Local environment */ char *locale_collate; + bool server_symlink; }; #define MAX_KEYS_BUFFER 256 From 9af3bb2d16d45415049812a04bfcab5fa6507eaa Mon Sep 17 00:00:00 2001 From: Shivshankar-Reddy Date: Tue, 30 Apr 2024 17:32:43 +0000 Subject: [PATCH 5/7] correct symlink name Signed-off-by: Shivshankar-Reddy --- src/server.c | 7 +++++-- src/server.h | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/server.c b/src/server.c index 34b2f0eb0c..b66d60742e 100644 --- a/src/server.c +++ b/src/server.c @@ -6992,10 +6992,13 @@ int main(int argc, char **argv) { char *exec_name = strrchr(argv[0], '/'); if (exec_name == NULL) exec_name = argv[0]; server.sentinel_mode = checkForSentinelMode(argc,argv, exec_name); + + /* Determine Valkey is started by using symlinks, server.server_symlink can be used + * to set actual process name later. */ if (strstr(exec_name,"redis-server") != NULL) { - server.server_symlink = true; + server.server_symlink = VALKEY_SYMLINKED; } else { - server.server_symlink = false; + server.server_symlink = VALKEY_NOT_SYMLINKED; } initServerConfig(); diff --git a/src/server.h b/src/server.h index da287e01bf..339296e513 100644 --- a/src/server.h +++ b/src/server.h @@ -96,6 +96,9 @@ struct hdr_histogram; /* helpers */ #define numElements(x) (sizeof(x)/sizeof((x)[0])) +#define VALKEY_NOT_SYMLINKED 0 /* To detemine Valkey started using symlink */ +#define VALKEY_SYMLINKED 1 /* To detemine Valkey started using symlink */ + /* min/max */ #undef min #undef max @@ -2073,7 +2076,7 @@ struct valkeyServer { int reply_buffer_resizing_enabled; /* Is reply buffer resizing enabled (1 by default) */ /* Local environment */ char *locale_collate; - bool server_symlink; + int server_symlink; }; #define MAX_KEYS_BUFFER 256 From ed99e6740cc7c19e1fb69b30d2cfa3228b895033 Mon Sep 17 00:00:00 2001 From: Shivshankar-Reddy Date: Tue, 30 Apr 2024 17:34:42 +0000 Subject: [PATCH 6/7] correct spellcheck Signed-off-by: Shivshankar-Reddy --- src/server.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server.h b/src/server.h index 339296e513..a81fb05189 100644 --- a/src/server.h +++ b/src/server.h @@ -96,8 +96,8 @@ struct hdr_histogram; /* helpers */ #define numElements(x) (sizeof(x)/sizeof((x)[0])) -#define VALKEY_NOT_SYMLINKED 0 /* To detemine Valkey started using symlink */ -#define VALKEY_SYMLINKED 1 /* To detemine Valkey started using symlink */ +#define VALKEY_NOT_SYMLINKED 0 /* To determine Valkey started using symlink */ +#define VALKEY_SYMLINKED 1 /* To determine Valkey started using symlink */ /* min/max */ #undef min From 00d7cb53492431ec23ad19e47dc4ae9ee7729ba2 Mon Sep 17 00:00:00 2001 From: Shivshankar-Reddy Date: Wed, 1 May 2024 14:46:50 +0000 Subject: [PATCH 7/7] Remove the bool and compare with argv Signed-off-by: Shivshankar-Reddy --- src/aof.c | 4 ++-- src/server.c | 9 --------- src/server.h | 4 ---- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/aof.c b/src/aof.c index 58dceb5156..00914d1e65 100644 --- a/src/aof.c +++ b/src/aof.c @@ -1224,7 +1224,7 @@ void flushAppendOnlyFile(int force) { * OK state and log the event. */ if (server.aof_last_write_status == C_ERR) { serverLog(LL_NOTICE, - "AOF write error looks solved, The server can write again."); + "AOF write error looks solved. The server can write again."); server.aof_last_write_status = C_OK; } } @@ -2471,7 +2471,7 @@ int rewriteAppendOnlyFileBackground(void) { char tmpfile[256]; /* Child */ - if (server.server_symlink) { + if (strstr(server.exec_argv[0],"redis-server") != NULL) { serverSetProcTitle("redis-aof-rewrite"); } else { serverSetProcTitle("valkey-aof-rewrite"); diff --git a/src/server.c b/src/server.c index b66d60742e..02191da785 100644 --- a/src/server.c +++ b/src/server.c @@ -6992,15 +6992,6 @@ int main(int argc, char **argv) { char *exec_name = strrchr(argv[0], '/'); if (exec_name == NULL) exec_name = argv[0]; server.sentinel_mode = checkForSentinelMode(argc,argv, exec_name); - - /* Determine Valkey is started by using symlinks, server.server_symlink can be used - * to set actual process name later. */ - if (strstr(exec_name,"redis-server") != NULL) { - server.server_symlink = VALKEY_SYMLINKED; - } else { - server.server_symlink = VALKEY_NOT_SYMLINKED; - } - initServerConfig(); ACLInit(); /* The ACL subsystem must be initialized ASAP because the basic networking code and client creation depends on it. */ diff --git a/src/server.h b/src/server.h index a81fb05189..ea7f9c0ef2 100644 --- a/src/server.h +++ b/src/server.h @@ -96,9 +96,6 @@ struct hdr_histogram; /* helpers */ #define numElements(x) (sizeof(x)/sizeof((x)[0])) -#define VALKEY_NOT_SYMLINKED 0 /* To determine Valkey started using symlink */ -#define VALKEY_SYMLINKED 1 /* To determine Valkey started using symlink */ - /* min/max */ #undef min #undef max @@ -2076,7 +2073,6 @@ struct valkeyServer { int reply_buffer_resizing_enabled; /* Is reply buffer resizing enabled (1 by default) */ /* Local environment */ char *locale_collate; - int server_symlink; }; #define MAX_KEYS_BUFFER 256