Fix key archival configuration from static config.

diff --git a/src/migrate.c b/src/migrate.c
index 23f40e4898d4536935cc813774439be9a607d614..a08aa9611205ad493b555bd38796a29ab86f4948 100644 (file)
--- a/src/migrate.c
+++ b/src/migrate.c
@@ -253,7 +253,6 @@ socket_rd_err:
 }
 
 void stopKeyArchive(void) {
 }
 
 void stopKeyArchive(void) {

-    redisAssert(server.mdb_state == REDIS_MDB_ON);

     redisAssert(env != NULL);
 
     mdb_dbi_close(env, dbi);
     redisAssert(env != NULL);
 
     mdb_dbi_close(env, dbi);


@@ -264,7 +263,6 @@ void stopKeyArchive(void) {
 }
 
 int startKeyArchive(void) {
 }
 
 int startKeyArchive(void) {

-    redisAssert(server.mdb_state == REDIS_MDB_OFF);

     redisAssert(env == NULL);
 
     int ret;
     redisAssert(env == NULL);
 
     int ret;

diff --git a/src/redis.c b/src/redis.c
index eed212635dc3882626fe76043f64f54c92fdd02e..2cc46e5b47c132a99c0369bdaea12ca0aa8b92bf 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -1348,7 +1348,7 @@ void initServer() {
         }
     }
 
         }
     }
 

-    if (server.aof_state == REDIS_MDB_ON) {
+    if (server.mdb_state == REDIS_MDB_ON) {

         int retval = startKeyArchive();
         if (retval != 0) {
             redisLog(REDIS_WARNING, "Can't open the key-archive environment: %s",
         int retval = startKeyArchive();
         if (retval != 0) {
             redisLog(REDIS_WARNING, "Can't open the key-archive environment: %s",