special encoding limits redefined, and all the config options for special encodings...

[redis.git] / src / aof.c

diff --git a/src/aof.c b/src/aof.c
index 4dbce394c821930cab09da3a79ed0b8c26187626..959a5f52af6a6a4baa1f3def8165d08758b72c2c 100644 (file)
--- a/src/aof.c
+++ b/src/aof.c
@@ -218,6 +218,7 @@ 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)
         return REDIS_ERR;
 
     if (redis_fstat(fileno(fp),&sb) != -1 && sb.st_size == 0)
         return REDIS_ERR;


@@ -232,6 +233,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;


@@ -241,6 +244,12 @@ int loadAppendOnlyFile(char *filename) {
         struct redisCommand *cmd;
         int force_swapout;
 
         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))
                 break;
         if (fgets(buf,sizeof(buf),fp) == NULL) {
             if (feof(fp))
                 break;


@@ -297,6 +306,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:


@@ -549,7 +559,8 @@ int rewriteAppendOnlyFileBackground(void) {
         char tmpfile[256];
 
         if (server.vm_enabled) vmReopenSwapFile();
         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);