Merge remote branch 'pietern/unstable-brpoplpush' into unstable

[redis.git] / src / diskstore.c

diff --git a/src/diskstore.c b/src/diskstore.c
index 057bfc689c0121c5e5de82664794eec3594058b5..49c8706a48528141eb48bf3bab6dbada6bb837f4 100644 (file)
--- a/src/diskstore.c
+++ b/src/diskstore.c
@@ -456,7 +456,7 @@ void *dsRdbSave_thread(void *arg) {
     /* Use RENAME to make sure the DB file is changed atomically only
      * if the generate DB file is ok. */
     if (rename(tmpfile,filename) == -1) {
-        redisLog(REDIS_WARNING,"Error moving temp DB file on the final destination: %s", strerror(errno));
+        redisLog(REDIS_WARNING,"Error moving temp DB file on the final destination: %s (diskstore)", strerror(errno));
         unlink(tmpfile);
         dsRdbSaveSetState(REDIS_BGSAVE_THREAD_DONE_ERR);
         return NULL;
@@ -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;
+}