fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-16 15:40:49 +00:00
Code Issues Projects Releases Wiki Activity

blocking SAVE implemented

Browse Source
This commit is contained in:
antirez 2011-01-08 00:09:57 +01:00
parent 43574a72c3
commit cc2750670f
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/diskstore.c
View File

@ -474,7 +474,7 @@ werr:
return NULL;
}
int dsRdbSave(char *filename) {
int dsRdbSaveBackground(char *filename) {
pthread_t thread;
if (pthread_create(&thread,NULL,dsRdbSave_thread,zstrdup(filename)) != 0) {
@ -486,3 +486,24 @@ int dsRdbSave(char *filename) {
return REDIS_OK;
}
}
int dsRdbSave(char *filename) {
/* A blocking save is actually a non blocking save... just we wait
* for it to terminate in a non-busy loop. */
redisLog(REDIS_NOTICE,"Starting a blocking SAVE (BGSAVE + blocking wait)");
server.dirty_before_bgsave = server.dirty;
if (dsRdbSaveBackground(filename) == REDIS_ERR) return REDIS_ERR;
while(1) {
usleep(1000);
int state;
pthread_mutex_lock(&server.bgsavethread_mutex);
state = server.bgsavethread_state;
pthread_mutex_unlock(&server.bgsavethread_mutex);
if (state == REDIS_BGSAVE_THREAD_DONE_OK ||
state == REDIS_BGSAVE_THREAD_DONE_ERR) break;
}
return REDIS_OK;
}

2
src/rdb.c
View File

@ -504,7 +504,7 @@ int rdbSaveBackground(char *filename) {
if (server.ds_enabled) {
cacheForcePointInTime();
return dsRdbSave(filename);
return dsRdbSaveBackground(filename);
}
if ((childpid = fork()) == 0) {

1
src/redis.h
View File

@ -802,6 +802,7 @@ robj *dsGet(redisDb *db, robj *key, time_t *expire);
int dsDel(redisDb *db, robj *key);
int dsExists(redisDb *db, robj *key);
void dsFlushDb(int dbid);
int dsRdbSaveBackground(char *filename);
int dsRdbSave(char *filename);
/* Disk Store Cache */