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

set my_status in storage join response

v6.03_dev
YuQing 2019-11-15 15:05:11 +08:00
parent 22865e0542
commit 017fff46f3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -5,6 +5,8 @@ Version 6.03 2019-11-15
to that of tracker leader when the storage server found to that of tracker leader when the storage server found
it's status inconsistence it's status inconsistence
NOTE: the tracker and storage server must upgrade together
Version 6.02 2019-11-12 Version 6.02 2019-11-12
* get_file_info calculate CRC32 for appender file type * get_file_info calculate CRC32 for appender file type
* disk recovery download file to local temp file then rename it * disk recovery download file to local temp file then rename it

7
tracker/tracker_service.c
View File

@ -1605,17 +1605,18 @@ static int tracker_deal_storage_join(struct fast_task_info *pTask)
return result; return result;
} }
pJoinBodyResp = (TrackerStorageJoinBodyResp *)(pTask->data + \ pJoinBodyResp = (TrackerStorageJoinBodyResp *)(pTask->data +
sizeof(TrackerHeader)); sizeof(TrackerHeader));
memset(pJoinBodyResp, 0, sizeof(TrackerStorageJoinBodyResp)); memset(pJoinBodyResp, 0, sizeof(TrackerStorageJoinBodyResp));
pJoinBodyResp->my_status = pClientInfo->pStorage->status;
if (pClientInfo->pStorage->psync_src_server != NULL) if (pClientInfo->pStorage->psync_src_server != NULL)
{ {
strcpy(pJoinBodyResp->src_id, \ strcpy(pJoinBodyResp->src_id,
pClientInfo->pStorage->psync_src_server->id); pClientInfo->pStorage->psync_src_server->id);
} }
pTask->length = sizeof(TrackerHeader) + \ pTask->length = sizeof(TrackerHeader) +
sizeof(TrackerStorageJoinBodyResp); sizeof(TrackerStorageJoinBodyResp);
return 0; return 0;
} }