server.replstate -> server.repl_state

diff --git a/src/config.c b/src/config.c
index f74f3f9749ab279a3516f72efd1a9502efdbc480..4a25489a603f79933a54cc1f224aaeb90132c022 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -179,7 +179,7 @@ void loadServerConfigFromString(char *config) {
         } else if (!strcasecmp(argv[0],"slaveof") && argc == 3) {
             server.masterhost = sdsnew(argv[1]);
             server.masterport = atoi(argv[2]);
         } else if (!strcasecmp(argv[0],"slaveof") && argc == 3) {
             server.masterhost = sdsnew(argv[1]);
             server.masterport = atoi(argv[2]);

-            server.replstate = REDIS_REPL_CONNECT;
+            server.repl_state = REDIS_REPL_CONNECT;

         } else if (!strcasecmp(argv[0],"repl-ping-slave-period") && argc == 2) {
             server.repl_ping_slave_period = atoi(argv[1]);
             if (server.repl_ping_slave_period <= 0) {
         } else if (!strcasecmp(argv[0],"repl-ping-slave-period") && argc == 2) {
             server.repl_ping_slave_period = atoi(argv[1]);
             if (server.repl_ping_slave_period <= 0) {

diff --git a/src/networking.c b/src/networking.c
index bc807c4b905a041d6fa7f294374b7fdb0267a5d2..59512f0ff76260d271b78138d07b82440a5cd5fb 100644 (file)
--- a/src/networking.c
+++ b/src/networking.c
@@ -519,7 +519,7 @@ void freeClient(redisClient *c) {
     /* Case 2: we lost the connection with the master. */
     if (c->flags & REDIS_MASTER) {
         server.master = NULL;
     /* Case 2: we lost the connection with the master. */
     if (c->flags & REDIS_MASTER) {
         server.master = NULL;

-        server.replstate = REDIS_REPL_CONNECT;
+        server.repl_state = REDIS_REPL_CONNECT;

         server.repl_down_since = time(NULL);
         /* Since we lost the connection with the master, we should also
          * close the connection with all our slaves if we have any, so
         server.repl_down_since = time(NULL);
         /* Since we lost the connection with the master, we should also
          * close the connection with all our slaves if we have any, so

diff --git a/src/redis.c b/src/redis.c
index da975636e3d5cd891ed9bfad53acf581cef5b2b5..091461159e165c8c8be49663f0a8f6e6872bdb91 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -923,7 +923,7 @@ void initServerConfig() {
     server.masterhost = NULL;
     server.masterport = 6379;
     server.master = NULL;
     server.masterhost = NULL;
     server.masterport = 6379;
     server.master = NULL;

-    server.replstate = REDIS_REPL_NONE;
+    server.repl_state = REDIS_REPL_NONE;

     server.repl_syncio_timeout = REDIS_REPL_SYNCIO_TIMEOUT;
     server.repl_serve_stale_data = 1;
     server.repl_down_since = -1;
     server.repl_syncio_timeout = REDIS_REPL_SYNCIO_TIMEOUT;
     server.repl_serve_stale_data = 1;
     server.repl_down_since = -1;


@@ -1254,7 +1254,7 @@ int processCommand(redisClient *c) {
 
     /* Only allow INFO and SLAVEOF when slave-serve-stale-data is no and
      * we are a slave with a broken link with master. */
 
     /* Only allow INFO and SLAVEOF when slave-serve-stale-data is no and
      * we are a slave with a broken link with master. */

-    if (server.masterhost && server.replstate != REDIS_REPL_CONNECTED &&
+    if (server.masterhost && server.repl_state != REDIS_REPL_CONNECTED &&

         server.repl_serve_stale_data == 0 &&
         c->cmd->proc != infoCommand && c->cmd->proc != slaveofCommand)
     {
         server.repl_serve_stale_data == 0 &&
         c->cmd->proc != infoCommand && c->cmd->proc != slaveofCommand)
     {


@@ -1592,14 +1592,14 @@ sds genRedisInfoString(char *section) {
                 "master_sync_in_progress:%d\r\n"
                 ,server.masterhost,
                 server.masterport,
                 "master_sync_in_progress:%d\r\n"
                 ,server.masterhost,
                 server.masterport,

-                (server.replstate == REDIS_REPL_CONNECTED) ?
+                (server.repl_state == REDIS_REPL_CONNECTED) ?

                     "up" : "down",
                 server.master ?
                 ((int)(time(NULL)-server.master->lastinteraction)) : -1,
                     "up" : "down",
                 server.master ?
                 ((int)(time(NULL)-server.master->lastinteraction)) : -1,

-                server.replstate == REDIS_REPL_TRANSFER
+                server.repl_state == REDIS_REPL_TRANSFER

             );
 
             );
 

-            if (server.replstate == REDIS_REPL_TRANSFER) {
+            if (server.repl_state == REDIS_REPL_TRANSFER) {

                 info = sdscatprintf(info,
                     "master_sync_left_bytes:%ld\r\n"
                     "master_sync_last_io_seconds_ago:%d\r\n"
                 info = sdscatprintf(info,
                     "master_sync_left_bytes:%ld\r\n"
                     "master_sync_last_io_seconds_ago:%d\r\n"


@@ -1608,7 +1608,7 @@ sds genRedisInfoString(char *section) {
                 );
             }
 
                 );
             }
 

-            if (server.replstate != REDIS_REPL_CONNECTED) {
+            if (server.repl_state != REDIS_REPL_CONNECTED) {

                 info = sdscatprintf(info,
                     "master_link_down_since_seconds:%ld\r\n",
                     (long)time(NULL)-server.repl_down_since);
                 info = sdscatprintf(info,
                     "master_link_down_since_seconds:%ld\r\n",
                     (long)time(NULL)-server.repl_down_since);

diff --git a/src/redis.h b/src/redis.h
index 86fd47c682b60e07faa8ddff0e77b589a27eb46d..aa79b4ada48aacb8ca7881d10d0f29da0ba96bc1 100644 (file)
--- a/src/redis.h
+++ b/src/redis.h
@@ -588,7 +588,7 @@ struct redisServer {
     int repl_timeout;               /* Timeout after N seconds of master idle */
     redisClient *master;     /* Client that is master for this slave */
     int repl_syncio_timeout; /* Timeout for synchronous I/O calls */
     int repl_timeout;               /* Timeout after N seconds of master idle */
     redisClient *master;     /* Client that is master for this slave */
     int repl_syncio_timeout; /* Timeout for synchronous I/O calls */

-    int replstate;           /* Replication status if the instance is a slave */
+    int repl_state;          /* Replication status if the instance is a slave */

     off_t repl_transfer_left;  /* Bytes left reading .rdb  */
     int repl_transfer_s;     /* Slave -> Master SYNC socket */
     int repl_transfer_fd;    /* Slave -> Master SYNC temp file descriptor */
     off_t repl_transfer_left;  /* Bytes left reading .rdb  */
     int repl_transfer_s;     /* Slave -> Master SYNC socket */
     int repl_transfer_fd;    /* Slave -> Master SYNC temp file descriptor */

diff --git a/src/replication.c b/src/replication.c
index 3424ff362c198b2a8bf5e5e1e3bf5eb227538e20..e08517e811e595edef98bf7b27f473ba4bc42e43 100644 (file)
--- a/src/replication.c
+++ b/src/replication.c
@@ -89,7 +89,7 @@ void syncCommand(redisClient *c) {
 
     /* Refuse SYNC requests if we are a slave but the link with our master
      * is not ok... */
 
     /* Refuse SYNC requests if we are a slave but the link with our master
      * is not ok... */

-    if (server.masterhost && server.replstate != REDIS_REPL_CONNECTED) {
+    if (server.masterhost && server.repl_state != REDIS_REPL_CONNECTED) {

         addReplyError(c,"Can't SYNC while not connected with my master");
         return;
     }
         addReplyError(c,"Can't SYNC while not connected with my master");
         return;
     }


@@ -265,14 +265,14 @@ void updateSlavesWaitingBgsave(int bgsaveerr) {
 
 /* Abort the async download of the bulk dataset while SYNC-ing with master */
 void replicationAbortSyncTransfer(void) {
 
 /* Abort the async download of the bulk dataset while SYNC-ing with master */
 void replicationAbortSyncTransfer(void) {

-    redisAssert(server.replstate == REDIS_REPL_TRANSFER);
+    redisAssert(server.repl_state == REDIS_REPL_TRANSFER);

 
     aeDeleteFileEvent(server.el,server.repl_transfer_s,AE_READABLE);
     close(server.repl_transfer_s);
     close(server.repl_transfer_fd);
     unlink(server.repl_transfer_tmpfile);
     zfree(server.repl_transfer_tmpfile);
 
     aeDeleteFileEvent(server.el,server.repl_transfer_s,AE_READABLE);
     close(server.repl_transfer_s);
     close(server.repl_transfer_fd);
     unlink(server.repl_transfer_tmpfile);
     zfree(server.repl_transfer_tmpfile);

-    server.replstate = REDIS_REPL_CONNECT;
+    server.repl_state = REDIS_REPL_CONNECT;

 }
 
 /* Asynchronously read the SYNC payload we receive from a master */
 }
 
 /* Asynchronously read the SYNC payload we receive from a master */


@@ -356,7 +356,7 @@ void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) {
         server.master = createClient(server.repl_transfer_s);
         server.master->flags |= REDIS_MASTER;
         server.master->authenticated = 1;
         server.master = createClient(server.repl_transfer_s);
         server.master->flags |= REDIS_MASTER;
         server.master->authenticated = 1;

-        server.replstate = REDIS_REPL_CONNECTED;
+        server.repl_state = REDIS_REPL_CONNECTED;

         redisLog(REDIS_NOTICE, "MASTER <-> SLAVE sync: Finished with success");
         /* Restart the AOF subsystem now that we finished the sync. This
          * will trigger an AOF rewrite, and when done will start appending
         redisLog(REDIS_NOTICE, "MASTER <-> SLAVE sync: Finished with success");
         /* Restart the AOF subsystem now that we finished the sync. This
          * will trigger an AOF rewrite, and when done will start appending


@@ -392,7 +392,7 @@ void syncWithMaster(aeEventLoop *el, int fd, void *privdata, int mask) {
 
     /* If this event fired after the user turned the instance into a master
      * with SLAVEOF NO ONE we must just return ASAP. */
 
     /* If this event fired after the user turned the instance into a master
      * with SLAVEOF NO ONE we must just return ASAP. */

-    if (server.replstate == REDIS_REPL_NONE) {
+    if (server.repl_state == REDIS_REPL_NONE) {

         close(fd);
         return;
     }
         close(fd);
         return;
     }


@@ -454,7 +454,7 @@ void syncWithMaster(aeEventLoop *el, int fd, void *privdata, int mask) {
         goto error;
     }
 
         goto error;
     }
 

-    server.replstate = REDIS_REPL_TRANSFER;
+    server.repl_state = REDIS_REPL_TRANSFER;

     server.repl_transfer_left = -1;
     server.repl_transfer_fd = dfd;
     server.repl_transfer_lastio = time(NULL);
     server.repl_transfer_left = -1;
     server.repl_transfer_fd = dfd;
     server.repl_transfer_lastio = time(NULL);


@@ -462,7 +462,7 @@ void syncWithMaster(aeEventLoop *el, int fd, void *privdata, int mask) {
     return;
 
 error:
     return;
 
 error:

-    server.replstate = REDIS_REPL_CONNECT;
+    server.repl_state = REDIS_REPL_CONNECT;

     close(fd);
     return;
 }
     close(fd);
     return;
 }


@@ -487,7 +487,7 @@ int connectWithMaster(void) {
 
     server.repl_transfer_lastio = time(NULL);
     server.repl_transfer_s = fd;
 
     server.repl_transfer_lastio = time(NULL);
     server.repl_transfer_s = fd;

-    server.replstate = REDIS_REPL_CONNECTING;
+    server.repl_state = REDIS_REPL_CONNECTING;

     return REDIS_OK;
 }
 
     return REDIS_OK;
 }
 


@@ -496,11 +496,11 @@ int connectWithMaster(void) {
 void undoConnectWithMaster(void) {
     int fd = server.repl_transfer_s;
 
 void undoConnectWithMaster(void) {
     int fd = server.repl_transfer_s;
 

-    redisAssert(server.replstate == REDIS_REPL_CONNECTING);
+    redisAssert(server.repl_state == REDIS_REPL_CONNECTING);

     aeDeleteFileEvent(server.el,fd,AE_READABLE|AE_WRITABLE);
     close(fd);
     server.repl_transfer_s = -1;
     aeDeleteFileEvent(server.el,fd,AE_READABLE|AE_WRITABLE);
     close(fd);
     server.repl_transfer_s = -1;

-    server.replstate = REDIS_REPL_CONNECT;
+    server.repl_state = REDIS_REPL_CONNECT;

 }
 
 void slaveofCommand(redisClient *c) {
 }
 
 void slaveofCommand(redisClient *c) {


@@ -510,11 +510,11 @@ void slaveofCommand(redisClient *c) {
             sdsfree(server.masterhost);
             server.masterhost = NULL;
             if (server.master) freeClient(server.master);
             sdsfree(server.masterhost);
             server.masterhost = NULL;
             if (server.master) freeClient(server.master);

-            if (server.replstate == REDIS_REPL_TRANSFER)
+            if (server.repl_state == REDIS_REPL_TRANSFER)

                 replicationAbortSyncTransfer();
                 replicationAbortSyncTransfer();

-            else if (server.replstate == REDIS_REPL_CONNECTING)
+            else if (server.repl_state == REDIS_REPL_CONNECTING)

                 undoConnectWithMaster();
                 undoConnectWithMaster();

-            server.replstate = REDIS_REPL_NONE;
+            server.repl_state = REDIS_REPL_NONE;

             redisLog(REDIS_NOTICE,"MASTER MODE enabled (user request)");
         }
     } else {
             redisLog(REDIS_NOTICE,"MASTER MODE enabled (user request)");
         }
     } else {


@@ -522,9 +522,9 @@ void slaveofCommand(redisClient *c) {
         server.masterhost = sdsdup(c->argv[1]->ptr);
         server.masterport = atoi(c->argv[2]->ptr);
         if (server.master) freeClient(server.master);
         server.masterhost = sdsdup(c->argv[1]->ptr);
         server.masterport = atoi(c->argv[2]->ptr);
         if (server.master) freeClient(server.master);

-        if (server.replstate == REDIS_REPL_TRANSFER)
+        if (server.repl_state == REDIS_REPL_TRANSFER)

             replicationAbortSyncTransfer();
             replicationAbortSyncTransfer();

-        server.replstate = REDIS_REPL_CONNECT;
+        server.repl_state = REDIS_REPL_CONNECT;

         redisLog(REDIS_NOTICE,"SLAVE OF %s:%d enabled (user request)",
             server.masterhost, server.masterport);
     }
         redisLog(REDIS_NOTICE,"SLAVE OF %s:%d enabled (user request)",
             server.masterhost, server.masterport);
     }


@@ -535,7 +535,7 @@ void slaveofCommand(redisClient *c) {
 
 void replicationCron(void) {
     /* Non blocking connection timeout? */
 
 void replicationCron(void) {
     /* Non blocking connection timeout? */

-    if (server.masterhost && server.replstate == REDIS_REPL_CONNECTING &&
+    if (server.masterhost && server.repl_state == REDIS_REPL_CONNECTING &&

         (time(NULL)-server.repl_transfer_lastio) > server.repl_timeout)
     {
         redisLog(REDIS_WARNING,"Timeout connecting to the MASTER...");
         (time(NULL)-server.repl_transfer_lastio) > server.repl_timeout)
     {
         redisLog(REDIS_WARNING,"Timeout connecting to the MASTER...");


@@ -543,7 +543,7 @@ void replicationCron(void) {
     }
 
     /* Bulk transfer I/O timeout? */
     }
 
     /* Bulk transfer I/O timeout? */

-    if (server.masterhost && server.replstate == REDIS_REPL_TRANSFER &&
+    if (server.masterhost && server.repl_state == REDIS_REPL_TRANSFER &&

         (time(NULL)-server.repl_transfer_lastio) > server.repl_timeout)
     {
         redisLog(REDIS_WARNING,"Timeout receiving bulk data from MASTER...");
         (time(NULL)-server.repl_transfer_lastio) > server.repl_timeout)
     {
         redisLog(REDIS_WARNING,"Timeout receiving bulk data from MASTER...");


@@ -551,7 +551,7 @@ void replicationCron(void) {
     }
 
     /* Timed out master when we are an already connected slave? */
     }
 
     /* Timed out master when we are an already connected slave? */

-    if (server.masterhost && server.replstate == REDIS_REPL_CONNECTED &&
+    if (server.masterhost && server.repl_state == REDIS_REPL_CONNECTED &&

         (time(NULL)-server.master->lastinteraction) > server.repl_timeout)
     {
         redisLog(REDIS_WARNING,"MASTER time out: no data nor PING received...");
         (time(NULL)-server.master->lastinteraction) > server.repl_timeout)
     {
         redisLog(REDIS_WARNING,"MASTER time out: no data nor PING received...");


@@ -559,7 +559,7 @@ void replicationCron(void) {
     }
 
     /* Check if we should connect to a MASTER */
     }
 
     /* Check if we should connect to a MASTER */

-    if (server.replstate == REDIS_REPL_CONNECT) {
+    if (server.repl_state == REDIS_REPL_CONNECT) {

         redisLog(REDIS_NOTICE,"Connecting to MASTER...");
         if (connectWithMaster() == REDIS_OK) {
             redisLog(REDIS_NOTICE,"MASTER <-> SLAVE sync started");
         redisLog(REDIS_NOTICE,"Connecting to MASTER...");
         if (connectWithMaster() == REDIS_OK) {
             redisLog(REDIS_NOTICE,"MASTER <-> SLAVE sync started");