diff --git a/src/scripting.c b/src/scripting.c index 2732c87fb..9afc08a94 100644 --- a/src/scripting.c +++ b/src/scripting.c @@ -1725,7 +1725,7 @@ int ldbRemoveChild(pid_t pid) { return 0; } -/* Return the number of children we still did not received termination +/* Return the number of children we still did not receive termination * acknowledge via wait() in the parent process. */ int ldbPendingChildren(void) { return listLength(ldb.children); diff --git a/src/sentinel.c b/src/sentinel.c index 76e0eb750..b608fc693 100644 --- a/src/sentinel.c +++ b/src/sentinel.c @@ -2628,7 +2628,7 @@ int sentinelSendPing(sentinelRedisInstance *ri) { ri->link->last_ping_time = mstime(); /* We update the active ping time only if we received the pong for * the previous ping, otherwise we are technically waiting since the - * first ping that did not received a reply. */ + * first ping that did not receive a reply. */ if (ri->link->act_ping_time == 0) ri->link->act_ping_time = ri->link->last_ping_time; return 1; @@ -3569,7 +3569,7 @@ void sentinelCheckSubjectivelyDown(sentinelRedisInstance *ri) { (mstime() - ri->link->cc_conn_time) > SENTINEL_MIN_LINK_RECONNECT_PERIOD && ri->link->act_ping_time != 0 && /* There is a pending ping... */ - /* The pending ping is delayed, and we did not received + /* The pending ping is delayed, and we did not receive * error replies as well. */ (mstime() - ri->link->act_ping_time) > (ri->down_after_period/2) && (mstime() - ri->link->last_pong_time) > (ri->down_after_period/2)) @@ -3725,7 +3725,7 @@ void sentinelAskMasterStateToOtherSentinels(sentinelRedisInstance *master, int f * * 1) We believe it is down, or there is a failover in progress. * 2) Sentinel is connected. - * 3) We did not received the info within SENTINEL_ASK_PERIOD ms. */ + * 3) We did not receive the info within SENTINEL_ASK_PERIOD ms. */ if ((master->flags & SRI_S_DOWN) == 0) continue; if (ri->link->disconnected) continue; if (!(flags & SENTINEL_ASK_FORCED) && diff --git a/tests/sentinel/tests/00-base.tcl b/tests/sentinel/tests/00-base.tcl index a79d0c371..7fb1a8bef 100644 --- a/tests/sentinel/tests/00-base.tcl +++ b/tests/sentinel/tests/00-base.tcl @@ -17,7 +17,7 @@ test "Basic failover works if the master is down" { wait_for_condition 1000 50 { [lindex [S $id SENTINEL GET-MASTER-ADDR-BY-NAME mymaster] 1] != $old_port } else { - fail "At least one Sentinel did not received failover info" + fail "At least one Sentinel did not receive failover info" } } restart_instance redis $master_id @@ -108,7 +108,7 @@ test "Failover works if we configure for absolute agreement" { wait_for_condition 1000 50 { [lindex [S $id SENTINEL GET-MASTER-ADDR-BY-NAME mymaster] 1] != $old_port } else { - fail "At least one Sentinel did not received failover info" + fail "At least one Sentinel did not receive failover info" } } restart_instance redis $master_id diff --git a/tests/sentinel/tests/01-conf-update.tcl b/tests/sentinel/tests/01-conf-update.tcl index 4998104d2..d45b1b08e 100644 --- a/tests/sentinel/tests/01-conf-update.tcl +++ b/tests/sentinel/tests/01-conf-update.tcl @@ -16,7 +16,7 @@ test "We can failover with Sentinel 1 crashed" { wait_for_condition 1000 50 { [lindex [S $id SENTINEL GET-MASTER-ADDR-BY-NAME mymaster] 1] != $old_port } else { - fail "Sentinel $id did not received failover info" + fail "Sentinel $id did not receive failover info" } } } @@ -30,7 +30,7 @@ test "After Sentinel 1 is restarted, its config gets updated" { wait_for_condition 1000 50 { [lindex [S 1 SENTINEL GET-MASTER-ADDR-BY-NAME mymaster] 1] != $old_port } else { - fail "Restarted Sentinel did not received failover info" + fail "Restarted Sentinel did not receive failover info" } } diff --git a/tests/sentinel/tests/02-slaves-reconf.tcl b/tests/sentinel/tests/02-slaves-reconf.tcl index fa15d2efd..28964c968 100644 --- a/tests/sentinel/tests/02-slaves-reconf.tcl +++ b/tests/sentinel/tests/02-slaves-reconf.tcl @@ -36,7 +36,7 @@ proc 02_crash_and_failover {} { wait_for_condition 1000 50 { [lindex [S $id SENTINEL GET-MASTER-ADDR-BY-NAME mymaster] 1] != $old_port } else { - fail "At least one Sentinel did not received failover info" + fail "At least one Sentinel did not receive failover info" } } restart_instance redis $master_id diff --git a/tests/sentinel/tests/05-manual.tcl b/tests/sentinel/tests/05-manual.tcl index 5214fdce1..ed568aa03 100644 --- a/tests/sentinel/tests/05-manual.tcl +++ b/tests/sentinel/tests/05-manual.tcl @@ -12,7 +12,7 @@ test "Manual failover works" { wait_for_condition 1000 50 { [lindex [S $id SENTINEL GET-MASTER-ADDR-BY-NAME mymaster] 1] != $old_port } else { - fail "At least one Sentinel did not received failover info" + fail "At least one Sentinel did not receive failover info" } } set addr [S 0 SENTINEL GET-MASTER-ADDR-BY-NAME mymaster]