gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bgsave_in_progress in INFO when BGSAVEing with diskstore enabled, don't DEBUG FLUSHCACHE when bgsave is in progress.

Browse Source
This commit is contained in:
antirez 2011-01-09 19:25:34 +01:00
parent 0a0f83ab2c
commit a5062bbab0
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/debug.c
View File

@ -181,6 +181,9 @@ void debugCommand(redisClient *c) {
if (!server.ds_enabled) { if (!server.ds_enabled) {
addReplyError(c, "DEBUG FLUSHCACHE called with diskstore off."); addReplyError(c, "DEBUG FLUSHCACHE called with diskstore off.");
return; return;
} else if (server.bgsavethread != (pthread_t) -1) {
addReplyError(c, "Can't flush cache while BGSAVE is in progress.");
return;
} else { } else {
/* To flush the whole cache we need to wait for everything to /* To flush the whole cache we need to wait for everything to
* be flushed on disk... */ * be flushed on disk... */

2
src/redis.c
View File

@ -1221,7 +1221,7 @@ sds genRedisInfoString(void) {
server.loading, server.loading,
server.appendonly, server.appendonly,
server.dirty, server.dirty,
server.bgsavechildpid != -1, server.bgsavechildpid != -1 || server.bgsavethread != (pthread_t) -1,
server.lastsave, server.lastsave,
server.bgrewritechildpid != -1, server.bgrewritechildpid != -1,
server.stat_numconnections, server.stat_numconnections,

16
tests/test_helper.tcl
View File

@ -133,14 +133,14 @@ proc execute_everything {} {
set ::diskstore 1 set ::diskstore 1
lappend ::denytags nodiskstore lappend ::denytags nodiskstore
set ::global_overrides {diskstore-enabled yes} set ::global_overrides {diskstore-enabled yes}
execute_tests "unit/protocol" # execute_tests "unit/protocol"
execute_tests "unit/basic" # execute_tests "unit/basic"
execute_tests "unit/type/list" # execute_tests "unit/type/list"
execute_tests "unit/type/set" # execute_tests "unit/type/set"
execute_tests "unit/type/zset" # execute_tests "unit/type/zset"
execute_tests "unit/type/hash" # execute_tests "unit/type/hash"
execute_tests "unit/sort" # execute_tests "unit/sort"
execute_tests "unit/expire" # execute_tests "unit/expire"
execute_tests "unit/other" execute_tests "unit/other"
execute_tests "unit/cas" execute_tests "unit/cas"
} }

2
tests/unit/other.tcl
View File

@ -12,7 +12,7 @@ start_server {tags {"other"}} {
r save r save
} {OK} } {OK}
tags {"slow"} { tags {slow nodiskstore} {
foreach fuzztype {binary alpha compr} { foreach fuzztype {binary alpha compr} {
test "FUZZ stresser with data model $fuzztype" { test "FUZZ stresser with data model $fuzztype" {
set err 0 set err 0