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

Allow rehashing if RDB thread is active, it doesn't suffer from COW madness

Browse Source 
Former-commit-id: 2f1f2eaa9d160701f45eed52fc7903fcccd7656b
This commit is contained in:
John Sully 2020-02-01 20:28:17 -05:00
parent 82cb879485
commit 2b86140abb
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/server.cpp
View File

@ -1353,6 +1353,16 @@ dictType dbDictType = {
dictObjectDestructor /* val destructor */ dictObjectDestructor /* val destructor */
}; };
/* db->pdict, keys are sds strings, vals uints. */
dictType dbDictTypeTombstone = {
dictSdsHash, /* hash function */
NULL, /* key dup */
NULL, /* val dup */
dictSdsKeyCompare, /* key compare */
dictDbKeyDestructor, /* key destructor */
NULL /* val destructor */
};
dictType dbSnapshotDictType = { dictType dbSnapshotDictType = {
dictSdsHash, dictSdsHash,
NULL, NULL,
@ -1509,7 +1519,7 @@ int redisDbPersistentData::incrementallyRehash() {
* for dict.c to resize the hash tables accordingly to the fact we have o not * for dict.c to resize the hash tables accordingly to the fact we have o not
* running childs. */ * running childs. */
void updateDictResizePolicy(void) { void updateDictResizePolicy(void) {
if (!hasActiveChildProcess()) if (!hasActiveChildProcess() || g_pserver->FRdbSaveInProgress())
dictEnableResize(); dictEnableResize();
else else
dictDisableResize(); dictDisableResize();
@ -1764,7 +1774,7 @@ void databasesCron(void) {
/* Perform hash tables rehashing if needed, but only if there are no /* Perform hash tables rehashing if needed, but only if there are no
* other processes saving the DB on disk. Otherwise rehashing is bad * other processes saving the DB on disk. Otherwise rehashing is bad
* as will cause a lot of copy-on-write of memory pages. */ * as will cause a lot of copy-on-write of memory pages. */
if (!hasActiveChildProcess()) { if (!hasActiveChildProcess() || g_pserver->FRdbSaveInProgress()) {
/* We use global counters so if we stop the computation at a given /* We use global counters so if we stop the computation at a given
* DB we'll be able to start from the successive in the next * DB we'll be able to start from the successive in the next
* cron loop iteration. */ * cron loop iteration. */
@ -1849,8 +1859,8 @@ void checkChildrenDone(void) {
int err; int err;
if ((err = pthread_tryjoin_np(g_pserver->rdbThreadVars.rdb_child_thread, &rval))) if ((err = pthread_tryjoin_np(g_pserver->rdbThreadVars.rdb_child_thread, &rval)))
{ {
if (err != EBUSY && errno != EAGAIN) if (err != EBUSY && err != EAGAIN)
serverLog(LL_WARNING, "Error joining the background RDB save thread: %s\n", strerror(err)); serverLog(LL_WARNING, "Error joining the background RDB save thread: %s\n", strerror(errno));
} }
else else
{ {