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

Fix the CI sentinel break issue (#30)

Browse Source 
I run the CI in my branch, test cases for sentinel could pass


https://github.com/hwware/placeholderkv/actions/runs/8429003027/job/23082549380
This commit is contained in:
Wen Hui 2024-03-26 10:20:08 -04:00 committed by GitHub
parent 340ab6d62d
commit 1c9710fca1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/server.c
View File

@ -6612,9 +6612,9 @@ void dismissMemoryInChild(void) {
void memtest(size_t megabytes, int passes); void memtest(size_t megabytes, int passes);
/* Returns 1 if there is --sentinel among the arguments or if /* 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) { 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++) for (int j = 1; j < argc; j++)
if (!strcmp(argv[j],"--sentinel")) return 1; if (!strcmp(argv[j],"--sentinel")) return 1;

2
tests/instances.tcl
View File

@ -50,7 +50,7 @@ proc exec_instance {type dirname cfgfile} {
if {$type eq "redis"} { if {$type eq "redis"} {
set prgname placeholderkv-server set prgname placeholderkv-server
} elseif {$type eq "sentinel"} { } elseif {$type eq "sentinel"} {
set prgname redis-sentinel set prgname placeholderkv-sentinel
} else { } else {
error "Unknown instance type." error "Unknown instance type."
} }