diff --git a/docker/test/stress/run.sh b/docker/test/stress/run.sh index 3a6491323f2..2e1c546ce8c 100755 --- a/docker/test/stress/run.sh +++ b/docker/test/stress/run.sh @@ -82,7 +82,7 @@ clickhouse-client --query "SHOW TABLES FROM test" stop # TODO remove me when persistent snapshots will be ready -rm -fr /var/lib/clickhouse/coordination :|| +rm -fr /var/lib/clickhouse/coordination ||: start clickhouse-client --query "SELECT 'Server successfuly started'" > /test_output/alive_check.txt || echo 'Server failed to start' > /test_output/alive_check.txt diff --git a/src/Coordination/NuKeeperServer.cpp b/src/Coordination/NuKeeperServer.cpp index 43bea42a5b8..400ef8fd58b 100644 --- a/src/Coordination/NuKeeperServer.cpp +++ b/src/Coordination/NuKeeperServer.cpp @@ -40,7 +40,7 @@ void NuKeeperServer::startup() nuraft::raft_params params; if (single_server) { - /// Don't make sence in single server mode + /// Don't make sense in single server mode params.heart_beat_interval_ = 0; params.election_timeout_lower_bound_ = 0; params.election_timeout_upper_bound_ = 0; @@ -198,7 +198,7 @@ nuraft::cb_func::ReturnCode NuKeeperServer::callbackFunc(nuraft::cb_func::Type t } case nuraft::cb_func::InitialBatchCommited: { - if (isLeader()) /// We have commited our log store and we are leader, ready to serve requests. + if (isLeader()) /// We have committed our log store and we are leader, ready to serve requests. set_initialized(); return nuraft::cb_func::ReturnCode::Ok; }