diff options
| author | [email protected] <[email protected]> | 2021-08-26 17:23:39 +0800 |
|---|---|---|
| committer | [email protected] <[email protected]> | 2021-08-26 17:23:39 +0800 |
| commit | bc525d48e4b39ca64f98dc78e87d08d6615568f4 (patch) | |
| tree | e789df94f4b5be6026ead88c4aadb5c03c28f61c /server | |
| parent | 39a4172bd7208f271d73d755b3ac410e4db062f6 (diff) | |
增加定时器,解决Pull元信息无响应时陷入停顿状态(valgrind)
Diffstat (limited to 'server')
| -rw-r--r-- | server/doris_server_http.cpp | 4 | ||||
| -rw-r--r-- | server/doris_server_main.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/server/doris_server_http.cpp b/server/doris_server_http.cpp index f8bdb4e..fa9f5f7 100644 --- a/server/doris_server_http.cpp +++ b/server/doris_server_http.cpp @@ -59,7 +59,7 @@ static int32_t check_producer_ready_sync(struct doris_business *business, struct /*request from sync client, check http posts-on-the-way first*/ if(business->posts_on_the_way) { - MESA_RUNTIME_LOGV3(g_doris_server_info.log_runtime, RLOG_LV_DEBUG, "HttpProducer, posts-on-the-way: %d, meta response 300", business->posts_on_the_way); + MESA_RUNTIME_LOGV3(g_doris_server_info.log_runtime, RLOG_LV_DEBUG, "HttpProducer, business: %s, posts-on-the-way: %d, meta response 300", business->bizname, business->posts_on_the_way); return 300; } @@ -68,7 +68,7 @@ static int32_t check_producer_ready_sync(struct doris_business *business, struct if((clientversion=atol(client_version)) > cur_version) { business_set_sync_peer_abnormal(business); - MESA_RUNTIME_LOGV3(g_doris_server_info.log_runtime, RLOG_LV_INFO, "HttpProducer, client version(%lu) is newer than server(%lu)", clientversion, cur_version); + MESA_RUNTIME_LOGV3(g_doris_server_info.log_runtime, RLOG_LV_INFO, "HttpProducer, business: %s, client version(%lu) is newer than server(%lu)", business->bizname, clientversion, cur_version); return 300; } diff --git a/server/doris_server_main.cpp b/server/doris_server_main.cpp index 2bc10f4..97cefe6 100644 --- a/server/doris_server_main.cpp +++ b/server/doris_server_main.cpp @@ -24,7 +24,7 @@ #include "doris_server_http.h" struct doris_global_info g_doris_server_info; -static unsigned long doris_version_20210825=20210825L; +static unsigned long doris_version_20210826=20210826L; int doris_mkdir_according_path(const char * path) { @@ -434,7 +434,7 @@ int main(int argc, char **argv) evhttp_set_cb(manager_http, "/doris/statistic/status", manager_statistic_status_requests_cb, NULL); evhttp_set_cb(manager_http, "/doris/statistic/threads", manager_statistic_threads_requests_cb, NULL); evhttp_set_gencb(manager_http, manager_generic_requests_cb, NULL); - g_doris_server_info.monitor = MESA_Monitor_instance_evhttp_new(manager_http, doris_version_20210825); + g_doris_server_info.monitor = MESA_Monitor_instance_evhttp_new(manager_http, doris_version_20210826); if(evhttp_accept_socket(manager_http, g_doris_server_info.manager)) { printf("evhttp_accept_socket %d error!\n", g_doris_server_info.manager); |
