From 1c9710fca10c8ea064b9e390d64ba9ec06cbbfd5 Mon Sep 17 00:00:00 2001 From: Wen Hui Date: Tue, 26 Mar 2024 10:20:08 -0400 Subject: [PATCH] Fix the CI sentinel break issue (#30) I run the CI in my branch, test cases for sentinel could pass https://github.com/hwware/placeholderkv/actions/runs/8429003027/job/23082549380 --- src/server.c | 4 ++-- tests/instances.tcl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server.c b/src/server.c index e4f4a12b5..3050859d6 100644 --- a/src/server.c +++ b/src/server.c @@ -6612,9 +6612,9 @@ void dismissMemoryInChild(void) { void memtest(size_t megabytes, int passes); /* Returns 1 if there is --sentinel among the arguments or if - * executable name contains "redis-sentinel". */ + * executable name contains "placeholderkv-sentinel". */ int checkForSentinelMode(int argc, char **argv, char *exec_name) { - if (strstr(exec_name,"redis-sentinel") != NULL) return 1; + if (strstr(exec_name,"placeholderkv-sentinel") != NULL) return 1; for (int j = 1; j < argc; j++) if (!strcmp(argv[j],"--sentinel")) return 1; diff --git a/tests/instances.tcl b/tests/instances.tcl index 89470d051..5daf69a26 100644 --- a/tests/instances.tcl +++ b/tests/instances.tcl @@ -50,7 +50,7 @@ proc exec_instance {type dirname cfgfile} { if {$type eq "redis"} { set prgname placeholderkv-server } elseif {$type eq "sentinel"} { - set prgname redis-sentinel + set prgname placeholderkv-sentinel } else { error "Unknown instance type." }