Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add timeout when replica connect master #1172

Merged
merged 8 commits into from
Dec 12, 2022
Merged

Add timeout when replica connect master #1172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f3cdba0
Add timeout when replica connect master
caipengbo Dec 9, 2022
e10f6f5
Add time_util.h
caipengbo Dec 9, 2022
cd3d799
update connect_timestamp
caipengbo Dec 9, 2022
c930571
add some comments
caipengbo Dec 9, 2022
06edc97
fix ScopeExit and SockConnect bug
caipengbo Dec 12, 2022
b73f6c4
Merge branch 'unstable' of https://github.com/caipengbo/kvrocks into …
caipengbo Dec 12, 2022
a4b0237
fix clang-tidy
caipengbo Dec 12, 2022
c566b5b
fix clang-tidy
caipengbo Dec 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/cluster/replication.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
#include "status.h"
#include "storage/batch_debugger.h"
#include "thread_util.h"
#include "time_util.h"

Status FeedSlaveThread::Start() {
try {
Expand Down Expand Up @@ -236,18 +237,24 @@ void ReplicationThread::CallbacksStateMachine::Start() {
handlers_.emplace_front(CallbacksStateMachine::WRITE, "auth write", authWriteCB);
}

uint64_t last_connect_timestamp = 0;
int connect_timeout_ms = 3100;

while (!repl_->stop_flag_ && bev == nullptr) {
Status s = Util::SockConnect(repl_->host_, repl_->port_, &cfd);
if (Util::GetTimeStampMS() - last_connect_timestamp < 1000) {
// prevent frequent re-connect when the master is down with the connection refused error
sleep(1);
}
last_connect_timestamp = Util::GetTimeStampMS();
Status s = Util::SockConnect(repl_->host_, repl_->port_, &cfd, connect_timeout_ms);
if (!s.IsOK()) {
LOG(ERROR) << "[replication] Failed to connect the master, err: " << s.Msg();
sleep(1);
continue;
}
bev = bufferevent_socket_new(repl_->base_, cfd, BEV_OPT_CLOSE_ON_FREE);
if (bev == nullptr) {
close(cfd);
LOG(ERROR) << "[replication] Failed to create the event socket";
sleep(1);
continue;
}
}
Expand Down
4 changes: 1 addition & 3 deletions src/common/io_util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,7 @@ Status SockConnect(const std::string &host, uint32_t port, int *fd, int conn_tim
sin.sin_port = htons(port);

fcntl(*fd, F_SETFL, O_NONBLOCK);
if (connect(*fd, reinterpret_cast<sockaddr *>(&sin), sizeof(sin))) {
return Status::FromErrno();
}
connect(*fd, reinterpret_cast<sockaddr *>(&sin), sizeof(sin));
PragmaTwice marked this conversation as resolved.
Show resolved Hide resolved

auto retmask = Util::aeWait(*fd, AE_WRITABLE, conn_timeout);
if ((retmask & AE_WRITABLE) == 0 || (retmask & AE_ERROR) != 0 || (retmask & AE_HUP) != 0) {
Expand Down
4 changes: 2 additions & 2 deletions src/common/scope_exit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ struct ScopeExit {
if (enabled_) f_();
}

void Enable() { enabled_ = false; }
void Enable() { enabled_ = true; }

void Disable() { enabled_ = true; }
void Disable() { enabled_ = false; }

bool enabled_;
F f_;
Expand Down