提交 baa293c7 编写于 作者: K KernelMaker

bugfix 1). binlog_sync tool 2). pika may block when client use pipline

上级 5b21f518
Subproject commit 2a67f86831412f85bb0e4b370226df55c19225df
Subproject commit 59c89f037dfdbd252e5f5f46fa6fcddc6f5716ba
......@@ -31,7 +31,7 @@ BinlogSync::BinlogSync(int64_t filenum, int64_t offset, int port, std::string& m
// Create thread
binlog_receiver_thread_ = new BinlogReceiverThread(port_ + 100, 1000);
binlog_receiver_thread_ = new BinlogReceiverThread(port_ + 1000, 1000);
trysync_thread_ = new TrysyncThread();
pthread_rwlock_init(&state_protector_, NULL);
......
......@@ -43,7 +43,7 @@ void* SlavepingThread::ThreadMain() {
pink::Status s;
int connect_retry_times = 0;
while (!should_exit_ && g_binlog_sync->ShouldStartPingMaster()) {
if (!should_exit_ && (cli_->Connect(g_binlog_sync->master_ip(), g_binlog_sync->master_port() + 200)).ok()) {
if (!should_exit_ && (cli_->Connect(g_binlog_sync->master_ip(), g_binlog_sync->master_port() + 2000)).ok()) {
cli_->set_send_timeout(1000);
cli_->set_recv_timeout(1000);
connect_retry_times = 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册