Commit 05557f6d authored by antirez's avatar antirez
Browse files

Don't accept SAVE if BGSAVE is in progress

parent ab48d029
BEFORE REDIS 1.0.0-rc1
- Remove max number of args limit
- GETSET
- Fix pure-PHP lib version 4 for the new protocol
- persistent expires
......@@ -9,6 +10,9 @@ BEFORE REDIS 1.0.0-rc1
- replication automated tests
- replication non stopping master<->slave syncronization
- an external tool able to perform the 'difference' between two Redis servers. It's like 'diff', but against Redis servers, and the output is the set of commands needed to turn the first server into the second, suitable to be sent via netcat.
- Shutdown must kill other background savings before to start saving. Otherwise the DB can get replaced by the child that rename(2) after the parent for some reason.
- Add missing commands in documentation
- Document replication
$ ./redis-diff 192.168.1.1 192.168.1.2 > diff.txt
$ cat diff.txt | nc 192.168.1.1 6379
......
......@@ -2310,6 +2310,10 @@ static void typeCommand(redisClient *c) {
}
static void saveCommand(redisClient *c) {
if (server.bgsaveinprogress) {
addReplySds(c,sdsnew("-ERR background save in progress\r\n"));
return;
}
if (rdbSave(server.dbfilename) == REDIS_OK) {
addReply(c,shared.ok);
} else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment