From 48ac1de1cb114be8a62e69e1dc68dfe277137105 Mon Sep 17 00:00:00 2001 From: obdev Date: Sun, 23 Apr 2023 08:23:00 +0000 Subject: [PATCH] Longops already exist will not report -4017 --- deps/easy/src/io/easy_negotiation.c | 18 +++++++++--------- src/rootserver/ddl_task/ob_ddl_scheduler.cpp | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/deps/easy/src/io/easy_negotiation.c b/deps/easy/src/io/easy_negotiation.c index 9176b9a18..6105210f3 100644 --- a/deps/easy/src/io/easy_negotiation.c +++ b/deps/easy/src/io/easy_negotiation.c @@ -37,9 +37,9 @@ static int easy_magic_in_support_list(uint64_t magic) 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) { @@ -191,9 +191,9 @@ int net_send_negotiate_message(uint8_t negotiation_enable, int fd, uint64_t magi easy_negotiation_msg_t ne_msg; memset(&ne_msg, 0, sizeof(ne_msg)); - 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_body.eio_magic = 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_body.eio_magic = magic; ne_msg.msg_body.io_thread_index = index; 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); - if (rcv_bytes <= 0) { - easy_info_log("no data to read, fd:%d, errno:%d", fd, errno); - return; + if (rcv_bytes <= 0) { + easy_info_log("no data to read, fd:%d, errno:%d", fd, errno); + return; } else { easy_info_log("easy_consume_negotiation_msg, read %d bytes msg!", rcv_bytes); diff --git a/src/rootserver/ddl_task/ob_ddl_scheduler.cpp b/src/rootserver/ddl_task/ob_ddl_scheduler.cpp index 64b781979..2cd48dfc2 100644 --- a/src/rootserver/ddl_task/ob_ddl_scheduler.cpp +++ b/src/rootserver/ddl_task/ob_ddl_scheduler.cpp @@ -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)); } else if (OB_FAIL(longops_mgr.register_longops(longops_stat))) { 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; } else { LOG_WARN("failed to register longops", K(ret));