hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Longops already exist will not report -4017

Browse Source
This commit is contained in:
obdev
2023-04-23 08:23:00 +00:00
committed by ob-robot
parent 9982a73567
commit 48ac1de1cb
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
deps/easy/src/io/easy_negotiation.c vendored
View File

@ -37,9 +37,9 @@ static int easy_magic_in_support_list(uint64_t magic)
return ret; return ret;
} }
extern char *easy_connection_str(easy_connection_t *c); extern char *easy_connection_str(easy_connection_t *c);
static int easy_encode_uint64(char *buf, const uint64_t buf_len, int64_t *pos, uint64_t val) static int easy_encode_uint64(char *buf, const uint64_t buf_len, int64_t *pos, uint64_t val)
{ {
@ -191,9 +191,9 @@ int net_send_negotiate_message(uint8_t negotiation_enable, int fd, uint64_t magi
easy_negotiation_msg_t ne_msg; easy_negotiation_msg_t ne_msg;
memset(&ne_msg, 0, sizeof(ne_msg)); memset(&ne_msg, 0, sizeof(ne_msg));
ne_msg.msg_header.header_magic = EASY_NEGOTIATION_PACKET_HEADER_MAGIC; ne_msg.msg_header.header_magic = EASY_NEGOTIATION_PACKET_HEADER_MAGIC;
ne_msg.msg_header.msg_body_len = sizeof(easy_negotiation_msg_body_t); ne_msg.msg_header.msg_body_len = sizeof(easy_negotiation_msg_body_t);
ne_msg.msg_body.eio_magic = magic; ne_msg.msg_body.eio_magic = magic;
ne_msg.msg_body.io_thread_index = index; ne_msg.msg_body.io_thread_index = index;
easy_addr_t addr = easy_inet_getpeername(fd); easy_addr_t addr = easy_inet_getpeername(fd);
@ -249,9 +249,9 @@ void net_consume_negotiation_msg(int fd, uint64_t magic)
while ((rcv_bytes = recv(fd, (char *) recv_buf, sizeof(recv_buf), MSG_PEEK)) < 0 && EINTR == errno); while ((rcv_bytes = recv(fd, (char *) recv_buf, sizeof(recv_buf), MSG_PEEK)) < 0 && EINTR == errno);
if (rcv_bytes <= 0) { if (rcv_bytes <= 0) {
easy_info_log("no data to read, fd:%d, errno:%d", fd, errno); easy_info_log("no data to read, fd:%d, errno:%d", fd, errno);
return; return;
} else { } else {
easy_info_log("easy_consume_negotiation_msg, read %d bytes msg!", rcv_bytes); easy_info_log("easy_consume_negotiation_msg, read %d bytes msg!", rcv_bytes);

2
src/rootserver/ddl_task/ob_ddl_scheduler.cpp
View File

@ -1990,7 +1990,7 @@ int ObDDLScheduler::add_task_to_longops_mgr(ObDDLTask *ddl_task)
LOG_WARN("failed to init longops stat", K(ret), KPC(ddl_task)); LOG_WARN("failed to init longops stat", K(ret), KPC(ddl_task));
} else if (OB_FAIL(longops_mgr.register_longops(longops_stat))) { } else if (OB_FAIL(longops_mgr.register_longops(longops_stat))) {
if (OB_ENTRY_EXIST == ret) { if (OB_ENTRY_EXIST == ret) {
LOG_WARN("longops already registered", K(ret)); LOG_INFO("longops for this ddl task already registered", K(*ddl_task));
ret = OB_SUCCESS; ret = OB_SUCCESS;
} else { } else {
LOG_WARN("failed to register longops", K(ret)); LOG_WARN("failed to register longops", K(ret));