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

finish up the RDB fuzz

Browse Source 
Former-commit-id: 0942188b0a263d4b7de013458e5a65dc2d3b206a
This commit is contained in:
John Sully 2019-09-28 17:38:46 -04:00
parent 08b353cd55
commit d9a244c34c
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/server.cpp
View File

@ -5206,6 +5206,20 @@ int main(int argc, char **argv) {
#endif #endif
moduleLoadFromQueue(); moduleLoadFromQueue();
ACLLoadUsersAtStartup(); ACLLoadUsersAtStartup();
// special case of FUZZING load from stdin then quit
if (strstr(argv[0],"keydb-fuzz-rdb") != NULL)
{
serverAssert(GlobalLocksAcquired());
rio rdb;
rdbSaveInfo rsi = RDB_SAVE_INFO_INIT;
startLoading(stdin);
rioInitWithFile(&rdb,stdin);
rdbLoadRio(&rdb,&rsi,0);
stopLoading();
return EXIT_SUCCESS;
}
loadDataFromDisk(); loadDataFromDisk();
if (g_pserver->cluster_enabled) { if (g_pserver->cluster_enabled) {
if (verifyClusterConfigWithData() == C_ERR) { if (verifyClusterConfigWithData() == C_ERR) {
@ -5242,11 +5256,7 @@ int main(int argc, char **argv) {
aeReleaseLock(); //Finally we can dump the lock aeReleaseLock(); //Finally we can dump the lock
moduleReleaseGIL(true); moduleReleaseGIL(true);
// If we're just fuzzing then we've already loaded the RDB so just quit successfully
if (strstr(argv[0],"keydb-fuzz-rdb") != NULL)
return EXIT_SUCCESS;
serverAssert(cserver.cthreads > 0 && cserver.cthreads <= MAX_EVENT_LOOPS); serverAssert(cserver.cthreads > 0 && cserver.cthreads <= MAX_EVENT_LOOPS);
pthread_t rgthread[MAX_EVENT_LOOPS]; pthread_t rgthread[MAX_EVENT_LOOPS];
for (int iel = 0; iel < cserver.cthreads; ++iel) for (int iel = 0; iel < cserver.cthreads; ++iel)