diff --git a/src/obproxy/iocore/eventsystem/ob_ethread.cpp b/src/obproxy/iocore/eventsystem/ob_ethread.cpp index 755d7b6d4a3714fff4711594d356819caeb82ad9..24470fefa1d11e2d689ed1bd5772e67ae0f2f2b1 100644 --- a/src/obproxy/iocore/eventsystem/ob_ethread.cpp +++ b/src/obproxy/iocore/eventsystem/ob_ethread.cpp @@ -289,7 +289,7 @@ inline void ObEThread::process_event(ObEvent *e, const int calling_code) if (OB_UNLIKELY(e->in_the_priority_queue_)) { LOG_WARN("event should not in in_the_priority_queue here", K(*e)); } else if (OB_UNLIKELY(c_temp != e->continuation_)) { - LOG_WARN("event should not in in_the_priority_queue here", K(*e)); + LOG_WARN("c_temp should equal e->continuation_", K(*e)); } else {/*do nothing*/} MUTEX_RELEASE(lock); diff --git a/src/obproxy/ob_proxy_main.cpp b/src/obproxy/ob_proxy_main.cpp index 448e06966cad0361223dd71a4795f63457361536..9a38e14c19de0da362bd720dc3d7f9c6a64c3bbd 100644 --- a/src/obproxy/ob_proxy_main.cpp +++ b/src/obproxy/ob_proxy_main.cpp @@ -311,7 +311,7 @@ int ObProxyMain::parse_cmd_line(const int argc, char *const argv[], ObProxyOptio if (0 == c) { if (OB_FAIL(parse_short_opt(long_opts[long_opts_idx].val, optarg, opts))) { - MPRINT("fail to parse long opt, ret=%d", ret); + MPRINT("fail to parse short opt, ret=%d", ret); break; } } else { diff --git a/src/obproxy/obutils/ob_config_server_processor.cpp b/src/obproxy/obutils/ob_config_server_processor.cpp index f35d0a9b51a7dcae3fdc884aa09d04115045a48a..38d158f858e450fee2699b0efd5b3fbff9cf0920 100644 --- a/src/obproxy/obutils/ob_config_server_processor.cpp +++ b/src/obproxy/obutils/ob_config_server_processor.cpp @@ -1868,7 +1868,7 @@ int ObConfigServerProcessor::parse_json_config_info(const ObString &json, const bool is_metadb_changed = false; if (OB_ISNULL(json_info = op_alloc(ObProxyJsonConfigInfo))) { ret = OB_ALLOCATE_MEMORY_FAILED; - LOG_ERROR("fail to alloc mem fot json config info", K(ret)); + LOG_ERROR("fail to alloc mem for json config info", K(ret)); } else if (OB_FAIL(json_info->parse(root))) { LOG_WARN("fail to parse json info", K(ret)); } else if (!json_info->is_valid()) { diff --git a/src/obproxy/obutils/ob_log_file_processor.cpp b/src/obproxy/obutils/ob_log_file_processor.cpp index 29e741a3aa9c225ace5dcba262154c685cec862d..21b46cabf0d1c266b2055d2f3b2c63b674c31600 100644 --- a/src/obproxy/obutils/ob_log_file_processor.cpp +++ b/src/obproxy/obutils/ob_log_file_processor.cpp @@ -90,7 +90,7 @@ int ObLogFileProcessor::start_cleanup_log_file() LOG_WARN("log file processor is not inited", K(ret)); } else if (OB_UNLIKELY(NULL != cleanup_cont_)) { ret = OB_ERR_UNEXPECTED; - LOG_WARN("log file cleanup task has already been schuduled", K_(cleanup_cont), K(ret)); + LOG_WARN("log file cleanup task has already been scheduled", K_(cleanup_cont), K(ret)); } else { int64_t interval_us = get_global_proxy_config().log_cleanup_interval; if (OB_ISNULL(cleanup_cont_ = ObAsyncCommonTask::create_and_start_repeat_task(interval_us, @@ -98,7 +98,7 @@ int ObLogFileProcessor::start_cleanup_log_file() ObLogFileProcessor::do_repeat_task, ObLogFileProcessor::update_interval))) { ret = OB_ERR_UNEXPECTED; - LOG_WARN("fail to create and start cleanup task", K(interval_us), K(ret)); + LOG_WARN("fail to create and start log cleanup task", K(interval_us), K(ret)); } else { LOG_INFO("succ to create and start log cleanup task", K(interval_us)); } diff --git a/src/obproxy/proxy/client/ob_client_vc.cpp b/src/obproxy/proxy/client/ob_client_vc.cpp index d7fb54d61cd10a53232894e1ede318b481fc3e05..e5935a1f87086bcea8e2cfe1329f952315ca7ad1 100644 --- a/src/obproxy/proxy/client/ob_client_vc.cpp +++ b/src/obproxy/proxy/client/ob_client_vc.cpp @@ -665,7 +665,7 @@ int ObMysqlClient::do_post_request() } case CLIENT_ACTION_READ_NORMAL_RESP: { if (OB_FAIL(setup_read_normal_resp())) { - LOG_WARN("fail to setup read handshake", K(ret)); + LOG_WARN("fail to setup read normal resp", K(ret)); } else if (OB_FAIL(schedule_active_timeout())) { LOG_WARN("fail to schedule_active_timeout", K(ret)); } else if (OB_FAIL(forward_mysql_request())) {