test adapted to run with diskstore, and a few bugs fixed

This commit is contained in:
antirez
2011-01-09 18:25:34 +01:00
parent 5e1d2d30f7
commit 69bfffb4a7
7 changed files with 39 additions and 14 deletions

View File

@ -529,7 +529,10 @@ int rewriteAppendOnlyFileBackground(void) {
pid_t childpid;
if (server.bgrewritechildpid != -1) return REDIS_ERR;
redisAssert(server.ds_enabled == 0);
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];