未验证 提交 02b73017 编写于 作者: LINGuanRen's avatar LINGuanRen 提交者: GitHub

Merge pull request #30 from xiaoleizi2016/issue_29

fix issue 29
......@@ -262,7 +262,7 @@ int ObProxy::start()
} else if (OB_FAIL(ObMysqlProxyServerMain::start_mysql_proxy_server(*mysql_config_params_))) {
LOG_ERROR("fail to start mysql proxy server", K(ret));
} else if (OB_FAIL(ObProxyMain::get_instance()->schedule_detect_task())) {
LOG_ERROR("fail to schedule detech task", K(ret));
LOG_ERROR("fail to schedule detect task", K(ret));
} else {
// we can't strongly dependent on the OCP.
......@@ -326,7 +326,7 @@ int ObProxy::start()
} else if (OB_FAIL(ObCacheCleaner::schedule_cache_cleaner())) {
LOG_WARN("fail to alloc and schedule cache cleaner", K(ret));
} else if (config_->is_metadb_used() && OB_FAIL(proxy_table_processor_.start_check_table_task())) {
LOG_WARN("fail to start check table check", K(ret));
LOG_WARN("fail to start check table task", K(ret));
} else if (OB_FAIL(hot_upgrade_processor_.start_hot_upgrade_task())) {
LOG_WARN("fail to start hot upgrade task", K(ret));
} else if (OB_FAIL(log_file_processor_->start_cleanup_log_file())) {
......@@ -338,7 +338,7 @@ int ObProxy::start()
} else if (OB_FAIL(tenant_stat_mgr_->start_tenant_stat_dump_task())) {
LOG_ERROR("fail to start_tenant_stat_dump_task", K(ret));
} else if (OB_FAIL(g_ob_qos_stat_processor.start_qos_stat_clean_task())) {
LOG_ERROR("fail to start_tenant_stat_dump_task", K(ret));
LOG_ERROR("fail to start_qos_stat_clean_task", K(ret));
} else if (config_->enable_sharding
&& config_->is_control_plane_used()
&& !config_->use_local_dbconfig
......
......@@ -2069,7 +2069,7 @@ int ObMysqlSM::analyze_login_request(ObRequestAnalyzeCtx &ctx, ObMysqlAnalyzeSta
ObUnixNetVConnection* unix_vc = static_cast<ObUnixNetVConnection *>(client_session_->get_netvc());
if (NULL == unix_vc) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("client entry vc is null", K(ret));
LOG_WARN("client unix vc is null", K(ret));
} else if (hsr.response_.is_ssl_request() && !unix_vc->ssl_connected()) {
if (OB_FAIL(unix_vc->ssl_init(ObUnixNetVConnection::SSL_SERVER,
client_session_->get_vip_cluster_name(),
......
......@@ -43,7 +43,7 @@ int ObTenantServer::init(const ObIArray<ObProxyReplicaLocation> &locations)
LOG_WARN("invalid replica location", K(locations), K(ret));
} else if (OB_UNLIKELY(NULL != server_array_)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("server_list_ should be null here", K(server_array_), K(ret));
LOG_WARN("server_array_ should be null here", K(server_array_), K(ret));
} else {
const int64_t alloc_size = static_cast<int64_t>(sizeof(ObProxyReplicaLocation)) * locations.count();
char *server_list_buf = NULL;
......
......@@ -49,7 +49,7 @@ int ObLayout::init(const char *start_cmd)
MPRINT("layout has already been inited, ret=%d", ret);
} else if (OB_ISNULL(start_cmd)) {
ret = OB_ERR_UNEXPECTED;
MPRINT("start comd is NULL, ret=%d", ret);
MPRINT("start cmd is NULL, ret=%d", ret);
} else if (OB_ISNULL(cwd = arena.alloc(MAX_PATH_LENGTH))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
MPRINT("fail to alloc memeory,alloc_size=%ld, ret=%d", MAX_PATH_LENGTH, ret);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册