Remove comment

[redis.git] / src / aof.c

diff --git a/src/aof.c b/src/aof.c
index dffe95ed94ac92c8a0069dc4e96d68daff71917f..8ce6cd12856c413feab0ae6b512378578e912b5a 100644 (file)
--- a/src/aof.c
+++ b/src/aof.c
@@ -218,9 +218,12 @@ int loadAppendOnlyFile(char *filename) {
     FILE *fp = fopen(filename,"r");
     struct redis_stat sb;
     int appendonly = server.appendonly;
     FILE *fp = fopen(filename,"r");
     struct redis_stat sb;
     int appendonly = server.appendonly;

+    long loops = 0;

 
 

-    if (redis_fstat(fileno(fp),&sb) != -1 && sb.st_size == 0)
+    if (fp && redis_fstat(fileno(fp),&sb) != -1 && sb.st_size == 0) {
+        fclose(fp);

         return REDIS_ERR;
         return REDIS_ERR;

+    }

 
     if (fp == NULL) {
         redisLog(REDIS_WARNING,"Fatal error: can't open the append log file for reading: %s",strerror(errno));
 
     if (fp == NULL) {
         redisLog(REDIS_WARNING,"Fatal error: can't open the append log file for reading: %s",strerror(errno));


@@ -232,6 +235,8 @@ int loadAppendOnlyFile(char *filename) {
     server.appendonly = 0;
 
     fakeClient = createFakeClient();
     server.appendonly = 0;
 
     fakeClient = createFakeClient();

+    startLoading(fp);
+

     while(1) {
         int argc, j;
         unsigned long len;
     while(1) {
         int argc, j;
         unsigned long len;


@@ -239,7 +244,12 @@ int loadAppendOnlyFile(char *filename) {
         char buf[128];
         sds argsds;
         struct redisCommand *cmd;
         char buf[128];
         sds argsds;
         struct redisCommand *cmd;

-        int force_swapout;
+
+        /* Serve the clients from time to time */
+        if (!(loops++ % 1000)) {
+            loadingProgress(ftello(fp));
+            aeProcessEvents(server.el, AE_FILE_EVENTS|AE_DONT_WAIT);
+        }

 
         if (fgets(buf,sizeof(buf),fp) == NULL) {
             if (feof(fp))
 
         if (fgets(buf,sizeof(buf),fp) == NULL) {
             if (feof(fp))


@@ -277,17 +287,6 @@ int loadAppendOnlyFile(char *filename) {
         /* Clean up, ready for the next command */
         for (j = 0; j < argc; j++) decrRefCount(argv[j]);
         zfree(argv);
         /* Clean up, ready for the next command */
         for (j = 0; j < argc; j++) decrRefCount(argv[j]);
         zfree(argv);

-
-        /* Handle swapping while loading big datasets when VM is on */
-        force_swapout = 0;
-        if ((redisEstimateRSS() - server.vm_max_memory) > 1024*1024*32)
-            force_swapout = 1;
-
-        if (server.vm_enabled && force_swapout) {
-            while (redisEstimateRSS() > server.vm_max_memory) {
-                if (vmSwapOneObjectBlocking() == REDIS_ERR) break;
-            }
-        }

     }
 
     /* This point can only be reached when EOF is reached without errors.
     }
 
     /* This point can only be reached when EOF is reached without errors.


@@ -297,6 +296,7 @@ int loadAppendOnlyFile(char *filename) {
     fclose(fp);
     freeFakeClient(fakeClient);
     server.appendonly = appendonly;
     fclose(fp);
     freeFakeClient(fakeClient);
     server.appendonly = appendonly;

+    stopLoading();

     return REDIS_OK;
 
 readerr:
     return REDIS_OK;
 
 readerr:


@@ -349,22 +349,11 @@ int rewriteAppendOnlyFile(char *filename) {
             sds keystr = dictGetEntryKey(de);
             robj key, *o;
             time_t expiretime;
             sds keystr = dictGetEntryKey(de);
             robj key, *o;
             time_t expiretime;

-            int swapped;

 
             keystr = dictGetEntryKey(de);
             o = dictGetEntryVal(de);
             initStaticStringObject(key,keystr);
 
             keystr = dictGetEntryKey(de);
             o = dictGetEntryVal(de);
             initStaticStringObject(key,keystr);

-            /* If the value for this key is swapped, load a preview in memory.
-             * We use a "swapped" flag to remember if we need to free the
-             * value object instead to just increment the ref count anyway
-             * in order to avoid copy-on-write of pages if we are forked() */
-            if (!server.vm_enabled || o->storage == REDIS_VM_MEMORY ||
-                o->storage == REDIS_VM_SWAPPING) {
-                swapped = 0;
-            } else {
-                o = vmPreviewObject(o);
-                swapped = 1;
-            }
+

             expiretime = getExpire(db,&key);
 
             /* Save the key and associated value */
             expiretime = getExpire(db,&key);
 
             /* Save the key and associated value */


@@ -499,7 +488,6 @@ int rewriteAppendOnlyFile(char *filename) {
                 if (fwriteBulkObject(fp,&key) == 0) goto werr;
                 if (fwriteBulkLongLong(fp,expiretime) == 0) goto werr;
             }
                 if (fwriteBulkObject(fp,&key) == 0) goto werr;
                 if (fwriteBulkLongLong(fp,expiretime) == 0) goto werr;
             }

-            if (swapped) decrRefCount(o);

         }
         dictReleaseIterator(di);
     }
         }
         dictReleaseIterator(di);
     }


@@ -543,13 +531,16 @@ int rewriteAppendOnlyFileBackground(void) {
     pid_t childpid;
 
     if (server.bgrewritechildpid != -1) return REDIS_ERR;
     pid_t childpid;
 
     if (server.bgrewritechildpid != -1) return REDIS_ERR;

-    if (server.vm_enabled) waitEmptyIOJobsQueue();
+    if (server.ds_enabled != 0) {
+        redisLog(REDIS_WARNING,"BGREWRITEAOF called with diskstore enabled: AOF is not supported when diskstore is enabled. Operation not performed.");
+        return REDIS_ERR;
+    }

     if ((childpid = fork()) == 0) {
         /* Child */
         char tmpfile[256];
 
     if ((childpid = fork()) == 0) {
         /* Child */
         char tmpfile[256];
 

-        if (server.vm_enabled) vmReopenSwapFile();
-        close(server.fd);
+        if (server.ipfd > 0) close(server.ipfd);
+        if (server.sofd > 0) close(server.sofd);

         snprintf(tmpfile,256,"temp-rewriteaof-bg-%d.aof", (int) getpid());
         if (rewriteAppendOnlyFile(tmpfile) == REDIS_OK) {
             _exit(0);
         snprintf(tmpfile,256,"temp-rewriteaof-bg-%d.aof", (int) getpid());
         if (rewriteAppendOnlyFile(tmpfile) == REDIS_OK) {
             _exit(0);


@@ -599,10 +590,7 @@ void aofRemoveTempFile(pid_t childpid) {
 
 /* A background append only file rewriting (BGREWRITEAOF) terminated its work.
  * Handle this. */
 
 /* A background append only file rewriting (BGREWRITEAOF) terminated its work.
  * Handle this. */

-void backgroundRewriteDoneHandler(int statloc) {
-    int exitcode = WEXITSTATUS(statloc);
-    int bysignal = WIFSIGNALED(statloc);
-
+void backgroundRewriteDoneHandler(int exitcode, int bysignal) {

     if (!bysignal && exitcode == 0) {
         int fd;
         char tmpfile[256];
     if (!bysignal && exitcode == 0) {
         int fd;
         char tmpfile[256];


@@ -650,7 +638,7 @@ void backgroundRewriteDoneHandler(int statloc) {
     } else {
         redisLog(REDIS_WARNING,
             "Background append only file rewriting terminated by signal %d",
     } else {
         redisLog(REDIS_WARNING,
             "Background append only file rewriting terminated by signal %d",

-            WTERMSIG(statloc));
+            bysignal);

     }
 cleanup:
     sdsfree(server.bgrewritebuf);
     }
 cleanup:
     sdsfree(server.bgrewritebuf);