diff options
author | antirez <antirez@gmail.com> | 2017-12-11 18:37:31 +0100 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2017-12-11 18:37:31 +0100 |
commit | 19ff6fb58295a5d87901b85d6aa6add9df10f1f2 (patch) | |
tree | 0f76b8498f2c6479fee98b0b6a56a3efe2c67ae1 | |
parent | 5b8b83a6d1eb6575bfb25e585652cb42596586ae (diff) | |
download | redis-19ff6fb58295a5d87901b85d6aa6add9df10f1f2.tar.gz |
Remove trailing spaces from #4491 code.
-rw-r--r-- | src/replication.c | 2 | ||||
-rw-r--r-- | src/rio.c | 4 | ||||
-rw-r--r-- | src/server.c | 2 | ||||
-rw-r--r-- | tests/integration/psync2.tcl | 2 | ||||
-rw-r--r-- | tests/integration/replication-4.tcl | 2 | ||||
-rw-r--r-- | tests/integration/replication-psync.tcl | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/replication.c b/src/replication.c index 0bec849f5..001205f6d 100644 --- a/src/replication.c +++ b/src/replication.c @@ -1267,7 +1267,7 @@ void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) { } /* We reach here when the slave is using diskless replication, - * or when we are done reading from the socket to the rdb file. */ + * or when we are done reading from the socket to the RDB file. */ serverLog(LL_NOTICE, "MASTER <-> SLAVE sync: Flushing old data"); /* We need to stop any AOFRW fork before flusing and parsing * RDB, otherwise we'll create a copy-on-write disaster. */ @@ -173,13 +173,13 @@ static size_t rioFdRead(rio *r, void *buf, size_t len) { /* if the buffer is too small for the entire request: realloc */ if (sdslen(r->io.fd.buf) + sdsavail(r->io.fd.buf) < len) r->io.fd.buf = sdsMakeRoomFor(r->io.fd.buf, len - sdslen(r->io.fd.buf)); - + /* if the remaining unused buffer is not large enough: memmove so that we can read the rest */ if (len > avail && sdsavail(r->io.fd.buf) < len - avail) { sdsrange(r->io.fd.buf, r->io.fd.pos, -1); r->io.fd.pos = 0; } - + /* if we don't already have all the data in the sds, read more */ while (len > sdslen(r->io.fd.buf) - r->io.fd.pos) { size_t buffered = sdslen(r->io.fd.buf) - r->io.fd.pos; diff --git a/src/server.c b/src/server.c index 6b362bac6..94333e310 100644 --- a/src/server.c +++ b/src/server.c @@ -2578,7 +2578,7 @@ int prepareForShutdown(int flags) { flushAppendOnlyFile(1); aof_fsync(server.aof_fd); } - + if (saveit && isUnsyncedSlave()) { serverLog(LL_NOTICE,"Server is a slave with no loaded dataset, skipping RDB save on exit."); saveit = 0; diff --git a/tests/integration/psync2.tcl b/tests/integration/psync2.tcl index 44a705b4f..1f4a3313f 100644 --- a/tests/integration/psync2.tcl +++ b/tests/integration/psync2.tcl @@ -34,7 +34,7 @@ start_server {} { test "PSYNC2: ### SETTING diskless master: $mdl; diskless slave (sync, load): $sdls, $sdll ###" { } - + set cycle 1 while {([clock seconds]-$start_time) < $duration} { test "PSYNC2: --- CYCLE $cycle ---" { diff --git a/tests/integration/replication-4.tcl b/tests/integration/replication-4.tcl index 348b1cae5..91374e782 100644 --- a/tests/integration/replication-4.tcl +++ b/tests/integration/replication-4.tcl @@ -211,7 +211,7 @@ start_server {tags {"repl"}} { test {Kill master and restart slave} { # Kill the master mid-RDB sending catch {$master shutdown} - + # Restart slave catch {$slave debug restart} } diff --git a/tests/integration/replication-psync.tcl b/tests/integration/replication-psync.tcl index 69896a83b..08f344467 100644 --- a/tests/integration/replication-psync.tcl +++ b/tests/integration/replication-psync.tcl @@ -95,7 +95,7 @@ proc test_psync {descr duration backlog_size backlog_ttl delay cond mdl sdl reco [lindex [$slave role] 3] eq {connected} } else { fail "Slave still not connected after some time" - } + } set retry 10 while {$retry && ([$master debug digest] ne [$slave debug digest])}\ |