From f151ca8c42f198c3eee35c5fc667ec7bd742fe60 Mon Sep 17 00:00:00 2001 From: YuQing <384681@qq.com> Date: Wed, 16 Oct 2019 20:40:30 +0800 Subject: [PATCH] add_tracker_servers code refine --- tracker/tracker_mem.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/tracker/tracker_mem.c b/tracker/tracker_mem.c index f0c15b7..859db57 100644 --- a/tracker/tracker_mem.c +++ b/tracker/tracker_mem.c @@ -4131,6 +4131,9 @@ static int tracker_mem_check_add_tracker_servers(FDFSStorageJoinBody *pJoinBody) TrackerServerInfo *pLocalEnd; TrackerServerInfo *pNewServer; TrackerServerInfo *new_servers; + char ip_str_join[256]; + char ip_str_before[256]; + char ip_str_after[256]; int add_count; int bytes; @@ -4149,10 +4152,28 @@ static int tracker_mem_check_add_tracker_servers(FDFSStorageJoinBody *pJoinBody) } if (fdfs_server_contain_ex(pJoinTracker, pLocalTracker)) { + fdfs_server_info_to_string(pJoinTracker, + ip_str_join, sizeof(ip_str_join)); + fdfs_server_info_to_string(pLocalTracker, + ip_str_before, sizeof(ip_str_before)); + + logWarning("file: "__FILE__", line: %d, " + "tracker server ips not consistent, " + "join: %s, local: %s", __LINE__, + ip_str_join, ip_str_before); + if (pJoinTracker->count > pLocalTracker->count) { - tracker_mem_copy_uniq_tracker_servers(pJoinTracker, - pLocalTracker); + if (tracker_mem_copy_uniq_tracker_servers(pJoinTracker, + pLocalTracker) == 0) + { + fdfs_server_info_to_string(pLocalTracker, + ip_str_after, sizeof(ip_str_after)); + logInfo("file: "__FILE__", line: %d, " + "merge tracker server ips, before: %s, " + "after: %s", __LINE__, + ip_str_before, ip_str_after); + } } break; }