pdxx
/
fastdfs
mirror of https://github.com/happyfish100/fastdfs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bugfix: fdfs_monitor fix get index of the specified tracker server

v6.03_dev
YuQing 2019-11-16 09:25:57 +08:00
parent 017fff46f3
commit 9dc6742b1e
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -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

3
client/fdfs_monitor.c
View File

@ -131,8 +131,7 @@ int main(int argc, char *argv[])
for (i=0; i<g_tracker_group.server_count; i++)
{
if (fdfs_server_contain1(g_tracker_group.servers + i,
&conn) == 0)
if (fdfs_server_contain1(g_tracker_group.servers + i, &conn))
{
g_tracker_group.server_index = i;
break;

9
client/test/fdfs_monitor.c
View File

@ -131,8 +131,7 @@ int main(int argc, char *argv[])
for (i=0; i<g_tracker_group.server_count; i++)
{
if (fdfs_server_contain1(g_tracker_group.servers + i,
&conn) == 0)
if (fdfs_server_contain1(g_tracker_group.servers + i, &conn))
{
g_tracker_group.server_index = i;
break;
@ -352,8 +351,12 @@ static int list_storages(FDFSGroupStat *pGroupStat)
int second;
char szDelayTime[64];
delay_seconds = (int)(max_last_source_update - \
delay_seconds = (int)(max_last_source_update -
pStorageStat->last_synced_timestamp);
if (delay_seconds < 0)
{
delay_seconds = 0;
}
day = delay_seconds / (24 * 3600);
remain_seconds = delay_seconds % (24 * 3600);
hour = remain_seconds / 3600;

2
common/fdfs_define.h
View File

@ -14,7 +14,7 @@
#include <pthread.h>
#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"

2
storage/tracker_client_thread.c
View File

@ -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,