Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
e097c996
Unverified
Commit
e097c996
authored
Oct 28, 2019
by
Salvatore Sanfilippo
Committed by
GitHub
Oct 28, 2019
Browse files
Merge pull request #4761 from WJWH/minor-typos
Fix some minor typos in comments
parents
6f2fc342
fb1f4f4e
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/rdb.c
View file @
e097c996
...
@@ -2289,7 +2289,7 @@ void backgroundSaveDoneHandlerDisk(int exitcode, int bysignal) {
...
@@ -2289,7 +2289,7 @@ void backgroundSaveDoneHandlerDisk(int exitcode, int bysignal) {
}
}
/* A background saving child (BGSAVE) terminated its work. Handle this.
/* A background saving child (BGSAVE) terminated its work. Handle this.
* This function covers the case of RDB -> S
a
lves socket transfers for
* This function covers the case of RDB -> Sl
a
ves socket transfers for
* diskless replication. */
* diskless replication. */
void
backgroundSaveDoneHandlerSocket
(
int
exitcode
,
int
bysignal
)
{
void
backgroundSaveDoneHandlerSocket
(
int
exitcode
,
int
bysignal
)
{
if
(
!
bysignal
&&
exitcode
==
0
)
{
if
(
!
bysignal
&&
exitcode
==
0
)
{
...
...
src/replication.c
View file @
e097c996
...
@@ -256,7 +256,7 @@ void replicationFeedSlaves(list *slaves, int dictid, robj **argv, int argc) {
...
@@ -256,7 +256,7 @@ void replicationFeedSlaves(list *slaves, int dictid, robj **argv, int argc) {
while
((
ln
=
listNext
(
&
li
)))
{
while
((
ln
=
listNext
(
&
li
)))
{
client
*
slave
=
ln
->
value
;
client
*
slave
=
ln
->
value
;
/* Don't feed slaves that are still waiting for BGSAVE to start */
/* Don't feed slaves that are still waiting for BGSAVE to start
.
*/
if
(
slave
->
replstate
==
SLAVE_STATE_WAIT_BGSAVE_START
)
continue
;
if
(
slave
->
replstate
==
SLAVE_STATE_WAIT_BGSAVE_START
)
continue
;
/* Feed slaves that are waiting for the initial SYNC (so these commands
/* Feed slaves that are waiting for the initial SYNC (so these commands
...
@@ -295,7 +295,7 @@ void replicationFeedSlavesFromMasterStream(list *slaves, char *buf, size_t bufle
...
@@ -295,7 +295,7 @@ void replicationFeedSlavesFromMasterStream(list *slaves, char *buf, size_t bufle
while
((
ln
=
listNext
(
&
li
)))
{
while
((
ln
=
listNext
(
&
li
)))
{
client
*
slave
=
ln
->
value
;
client
*
slave
=
ln
->
value
;
/* Don't feed slaves that are still waiting for BGSAVE to start */
/* Don't feed slaves that are still waiting for BGSAVE to start
.
*/
if
(
slave
->
replstate
==
SLAVE_STATE_WAIT_BGSAVE_START
)
continue
;
if
(
slave
->
replstate
==
SLAVE_STATE_WAIT_BGSAVE_START
)
continue
;
addReplyProto
(
slave
,
buf
,
buflen
);
addReplyProto
(
slave
,
buf
,
buflen
);
}
}
...
@@ -585,7 +585,7 @@ int startBgsaveForReplication(int mincapa) {
...
@@ -585,7 +585,7 @@ int startBgsaveForReplication(int mincapa) {
}
}
/* If we failed to BGSAVE, remove the slaves waiting for a full
/* If we failed to BGSAVE, remove the slaves waiting for a full
* resyncho
ri
nization from the list of slaves, inform them with
* resynch
r
onization from the list of slaves, inform them with
* an error about what happened, close the connection ASAP. */
* an error about what happened, close the connection ASAP. */
if
(
retval
==
C_ERR
)
{
if
(
retval
==
C_ERR
)
{
serverLog
(
LL_WARNING
,
"BGSAVE for replication failed"
);
serverLog
(
LL_WARNING
,
"BGSAVE for replication failed"
);
...
...
src/server.c
View file @
e097c996
...
@@ -3208,7 +3208,7 @@ void preventCommandReplication(client *c) {
...
@@ -3208,7 +3208,7 @@ void preventCommandReplication(client *c) {
* CMD_CALL_STATS Populate command stats.
* CMD_CALL_STATS Populate command stats.
* CMD_CALL_PROPAGATE_AOF Append command to AOF if it modified the dataset
* CMD_CALL_PROPAGATE_AOF Append command to AOF if it modified the dataset
* or if the client flags are forcing propagation.
* or if the client flags are forcing propagation.
* CMD_CALL_PROPAGATE_REPL Send command to s
a
lves if it modified the dataset
* CMD_CALL_PROPAGATE_REPL Send command to sl
a
ves if it modified the dataset
* or if the client flags are forcing propagation.
* or if the client flags are forcing propagation.
* CMD_CALL_PROPAGATE Alias for PROPAGATE_AOF|PROPAGATE_REPL.
* CMD_CALL_PROPAGATE Alias for PROPAGATE_AOF|PROPAGATE_REPL.
* CMD_CALL_FULL Alias for SLOWLOG|STATS|PROPAGATE.
* CMD_CALL_FULL Alias for SLOWLOG|STATS|PROPAGATE.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment