diff --git a/HISTORY b/HISTORY index c682110..6525d97 100644 --- a/HISTORY +++ b/HISTORY @@ -5,6 +5,8 @@ Version 6.03 2019-11-15 to that of tracker leader when the storage server found it's status inconsistence + NOTE: the tracker and storage server must upgrade together + Version 6.02 2019-11-12 * get_file_info calculate CRC32 for appender file type * disk recovery download file to local temp file then rename it diff --git a/tracker/tracker_service.c b/tracker/tracker_service.c index bb9e3b5..1ae44bb 100644 --- a/tracker/tracker_service.c +++ b/tracker/tracker_service.c @@ -1605,17 +1605,18 @@ static int tracker_deal_storage_join(struct fast_task_info *pTask) return result; } - pJoinBodyResp = (TrackerStorageJoinBodyResp *)(pTask->data + \ + pJoinBodyResp = (TrackerStorageJoinBodyResp *)(pTask->data + sizeof(TrackerHeader)); memset(pJoinBodyResp, 0, sizeof(TrackerStorageJoinBodyResp)); + pJoinBodyResp->my_status = pClientInfo->pStorage->status; if (pClientInfo->pStorage->psync_src_server != NULL) { - strcpy(pJoinBodyResp->src_id, \ + strcpy(pJoinBodyResp->src_id, pClientInfo->pStorage->psync_src_server->id); } - pTask->length = sizeof(TrackerHeader) + \ + pTask->length = sizeof(TrackerHeader) + sizeof(TrackerStorageJoinBodyResp); return 0; }