diff --git a/HISTORY b/HISTORY index 6525d97..942a152 100644 --- a/HISTORY +++ b/HISTORY @@ -1,9 +1,10 @@ -Version 6.03 2019-11-15 +Version 6.03 2019-11-16 * dual IPs support two different types of inner (intranet) IPs * storage server request tracker server to change it's status to that of tracker leader when the storage server found it's status inconsistence + * bugfix: fdfs_monitor fix get index of the specified tracker server NOTE: the tracker and storage server must upgrade together diff --git a/client/fdfs_monitor.c b/client/fdfs_monitor.c index b0a45ca..6bcc703 100644 --- a/client/fdfs_monitor.c +++ b/client/fdfs_monitor.c @@ -131,8 +131,7 @@ int main(int argc, char *argv[]) for (i=0; ilast_synced_timestamp); + if (delay_seconds < 0) + { + delay_seconds = 0; + } day = delay_seconds / (24 * 3600); remain_seconds = delay_seconds % (24 * 3600); hour = remain_seconds / 3600; diff --git a/common/fdfs_define.h b/common/fdfs_define.h index ea71032..92ffe36 100644 --- a/common/fdfs_define.h +++ b/common/fdfs_define.h @@ -14,7 +14,7 @@ #include #include "fastcommon/common_define.h" -#define FDFS_TRACKER_SERVER_DEF_PORT 22000 +#define FDFS_TRACKER_SERVER_DEF_PORT 22122 #define FDFS_STORAGE_SERVER_DEF_PORT 23000 #define FDFS_DEF_STORAGE_RESERVED_MB 1024 #define TRACKER_ERROR_LOG_FILENAME "trackerd" diff --git a/storage/tracker_client_thread.c b/storage/tracker_client_thread.c index 8259830..096c558 100644 --- a/storage/tracker_client_thread.c +++ b/storage/tracker_client_thread.c @@ -764,7 +764,7 @@ static void tracker_check_my_status(const int tracker_index) g_my_report_status[tracker_index].report_my_status = true; logInfo("file: "__FILE__", line: %d, " - "my status: %d (%s) from tracker #%d != my status: %d (%s)" + "my status: %d (%s) from tracker #%d != my status: %d (%s) " "from leader tracker #%d, set report_my_status to true", __LINE__, my_status, get_storage_status_caption( my_status), tracker_index, leader_status,