提交 d81f5e9f 编写于 作者: M Minghao Li

fix(sync): add detail log flag

上级 89e2c2d4
...@@ -497,30 +497,39 @@ static int32_t syncNodePreCommit(SSyncNode* ths, SSyncRaftEntry* pEntry) { ...@@ -497,30 +497,39 @@ static int32_t syncNodePreCommit(SSyncNode* ths, SSyncRaftEntry* pEntry) {
// prevLogIndex == -1 // prevLogIndex == -1
static bool syncNodeOnAppendEntriesLogOK(SSyncNode* pSyncNode, SyncAppendEntries* pMsg) { static bool syncNodeOnAppendEntriesLogOK(SSyncNode* pSyncNode, SyncAppendEntries* pMsg) {
if (pMsg->prevLogIndex == SYNC_INDEX_INVALID) { if (pMsg->prevLogIndex == SYNC_INDEX_INVALID) {
sTrace("syncNodeOnAppendEntriesLogOK true, pMsg->prevLogIndex:%ld", pMsg->prevLogIndex); if (gRaftDetailLog) {
sTrace("syncNodeOnAppendEntriesLogOK true, pMsg->prevLogIndex:%ld", pMsg->prevLogIndex);
}
return true; return true;
} }
SyncIndex myLastIndex = syncNodeGetLastIndex(pSyncNode); SyncIndex myLastIndex = syncNodeGetLastIndex(pSyncNode);
if (pMsg->prevLogIndex > myLastIndex) { if (pMsg->prevLogIndex > myLastIndex) {
sTrace("syncNodeOnAppendEntriesLogOK false, pMsg->prevLogIndex:%ld, myLastIndex:%ld", pMsg->prevLogIndex, if (gRaftDetailLog) {
myLastIndex); sTrace("syncNodeOnAppendEntriesLogOK false, pMsg->prevLogIndex:%ld, myLastIndex:%ld", pMsg->prevLogIndex,
myLastIndex);
}
return false; return false;
} }
SyncTerm myPreLogTerm = syncNodeGetPreTerm(pSyncNode, pMsg->prevLogIndex + 1); SyncTerm myPreLogTerm = syncNodeGetPreTerm(pSyncNode, pMsg->prevLogIndex + 1);
if (pMsg->prevLogIndex <= myLastIndex && pMsg->prevLogTerm == myPreLogTerm) { if (pMsg->prevLogIndex <= myLastIndex && pMsg->prevLogTerm == myPreLogTerm) {
if (gRaftDetailLog) {
sTrace(
"syncNodeOnAppendEntriesLogOK true, pMsg->prevLogIndex:%ld, myLastIndex:%ld, pMsg->prevLogTerm:%lu, "
"myPreLogTerm:%lu",
pMsg->prevLogIndex, myLastIndex, pMsg->prevLogTerm, myPreLogTerm);
}
return true;
}
if (gRaftDetailLog) {
sTrace( sTrace(
"syncNodeOnAppendEntriesLogOK true, pMsg->prevLogIndex:%ld, myLastIndex:%ld, pMsg->prevLogTerm:%lu, " "syncNodeOnAppendEntriesLogOK false, pMsg->prevLogIndex:%ld, myLastIndex:%ld, pMsg->prevLogTerm:%lu, "
"myPreLogTerm:%lu", "myPreLogTerm:%lu",
pMsg->prevLogIndex, myLastIndex, pMsg->prevLogTerm, myPreLogTerm); pMsg->prevLogIndex, myLastIndex, pMsg->prevLogTerm, myPreLogTerm);
return true;
} }
sTrace(
"syncNodeOnAppendEntriesLogOK false, pMsg->prevLogIndex:%ld, myLastIndex:%ld, pMsg->prevLogTerm:%lu, "
"myPreLogTerm:%lu",
pMsg->prevLogIndex, myLastIndex, pMsg->prevLogTerm, myPreLogTerm);
return false; return false;
} }
......
...@@ -119,7 +119,7 @@ cJSON *syncIndexMgr2Json(SSyncIndexMgr *pSyncIndexMgr) { ...@@ -119,7 +119,7 @@ cJSON *syncIndexMgr2Json(SSyncIndexMgr *pSyncIndexMgr) {
char *syncIndexMgr2Str(SSyncIndexMgr *pSyncIndexMgr) { char *syncIndexMgr2Str(SSyncIndexMgr *pSyncIndexMgr) {
cJSON *pJson = syncIndexMgr2Json(pSyncIndexMgr); cJSON *pJson = syncIndexMgr2Json(pSyncIndexMgr);
char * serialized = cJSON_Print(pJson); char *serialized = cJSON_Print(pJson);
cJSON_Delete(pJson); cJSON_Delete(pJson);
return serialized; return serialized;
} }
...@@ -146,9 +146,11 @@ void syncIndexMgrLog(SSyncIndexMgr *pObj) { ...@@ -146,9 +146,11 @@ void syncIndexMgrLog(SSyncIndexMgr *pObj) {
} }
void syncIndexMgrLog2(char *s, SSyncIndexMgr *pObj) { void syncIndexMgrLog2(char *s, SSyncIndexMgr *pObj) {
char *serialized = syncIndexMgr2Str(pObj); if (gRaftDetailLog) {
sTrace("syncIndexMgrLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized); char *serialized = syncIndexMgr2Str(pObj);
taosMemoryFree(serialized); sTrace("syncIndexMgrLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized);
taosMemoryFree(serialized);
}
} }
void syncIndexMgrSetTerm(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pRaftId, SyncTerm term) { void syncIndexMgrSetTerm(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pRaftId, SyncTerm term) {
......
...@@ -852,10 +852,12 @@ int32_t syncNodeSendMsgById(const SRaftId* destRaftId, SSyncNode* pSyncNode, SRp ...@@ -852,10 +852,12 @@ int32_t syncNodeSendMsgById(const SRaftId* destRaftId, SSyncNode* pSyncNode, SRp
SEpSet epSet; SEpSet epSet;
syncUtilraftId2EpSet(destRaftId, &epSet); syncUtilraftId2EpSet(destRaftId, &epSet);
if (pSyncNode->FpSendMsg != NULL) { if (pSyncNode->FpSendMsg != NULL) {
char* JsonStr = syncRpcMsg2Str(pMsg); if (gRaftDetailLog) {
syncUtilJson2Line(JsonStr); char* JsonStr = syncRpcMsg2Str(pMsg);
sTrace("sync send msg, vgId:%d, type:%d, msg:%s", pSyncNode->vgId, pMsg->msgType, JsonStr); syncUtilJson2Line(JsonStr);
taosMemoryFree(JsonStr); sTrace("sync send msg, vgId:%d, type:%d, msg:%s", pSyncNode->vgId, pMsg->msgType, JsonStr);
taosMemoryFree(JsonStr);
}
// htonl // htonl
syncUtilMsgHtoN(pMsg->pCont); syncUtilMsgHtoN(pMsg->pCont);
......
...@@ -145,9 +145,11 @@ void syncRpcMsgLog(SRpcMsg* pMsg) { ...@@ -145,9 +145,11 @@ void syncRpcMsgLog(SRpcMsg* pMsg) {
} }
void syncRpcMsgLog2(char* s, SRpcMsg* pMsg) { void syncRpcMsgLog2(char* s, SRpcMsg* pMsg) {
char* serialized = syncRpcMsg2Str(pMsg); if (gRaftDetailLog) {
sTrace("syncRpcMsgLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized); char* serialized = syncRpcMsg2Str(pMsg);
taosMemoryFree(serialized); sTrace("syncRpcMsgLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized);
taosMemoryFree(serialized);
}
} }
// ---- message process SyncTimeout---- // ---- message process SyncTimeout----
...@@ -274,9 +276,11 @@ void syncTimeoutLog(const SyncTimeout* pMsg) { ...@@ -274,9 +276,11 @@ void syncTimeoutLog(const SyncTimeout* pMsg) {
} }
void syncTimeoutLog2(char* s, const SyncTimeout* pMsg) { void syncTimeoutLog2(char* s, const SyncTimeout* pMsg) {
char* serialized = syncTimeout2Str(pMsg); if (gRaftDetailLog) {
sTrace("syncTimeoutLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized); char* serialized = syncTimeout2Str(pMsg);
taosMemoryFree(serialized); sTrace("syncTimeoutLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized);
taosMemoryFree(serialized);
}
} }
// ---- message process SyncPing---- // ---- message process SyncPing----
...@@ -534,9 +538,11 @@ void syncPingLog(const SyncPing* pMsg) { ...@@ -534,9 +538,11 @@ void syncPingLog(const SyncPing* pMsg) {
} }
void syncPingLog2(char* s, const SyncPing* pMsg) { void syncPingLog2(char* s, const SyncPing* pMsg) {
char* serialized = syncPing2Str(pMsg); if (gRaftDetailLog) {
sTrace("syncPingLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized); char* serialized = syncPing2Str(pMsg);
taosMemoryFree(serialized); sTrace("syncPingLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized);
taosMemoryFree(serialized);
}
} }
// ---- message process SyncPingReply---- // ---- message process SyncPingReply----
...@@ -794,9 +800,11 @@ void syncPingReplyLog(const SyncPingReply* pMsg) { ...@@ -794,9 +800,11 @@ void syncPingReplyLog(const SyncPingReply* pMsg) {
} }
void syncPingReplyLog2(char* s, const SyncPingReply* pMsg) { void syncPingReplyLog2(char* s, const SyncPingReply* pMsg) {
char* serialized = syncPingReply2Str(pMsg); if (gRaftDetailLog) {
sTrace("syncPingReplyLog2 | len:%zu | %s | %s", strlen(serialized), s, serialized); char* serialized = syncPingReply2Str(pMsg);
taosMemoryFree(serialized); sTrace("syncPingReplyLog2 | len:%zu | %s | %s", strlen(serialized), s, serialized);
taosMemoryFree(serialized);
}
} }
// ---- message process SyncClientRequest---- // ---- message process SyncClientRequest----
...@@ -935,9 +943,11 @@ void syncClientRequestLog(const SyncClientRequest* pMsg) { ...@@ -935,9 +943,11 @@ void syncClientRequestLog(const SyncClientRequest* pMsg) {
} }
void syncClientRequestLog2(char* s, const SyncClientRequest* pMsg) { void syncClientRequestLog2(char* s, const SyncClientRequest* pMsg) {
char* serialized = syncClientRequest2Str(pMsg); if (gRaftDetailLog) {
sTrace("syncClientRequestLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized); char* serialized = syncClientRequest2Str(pMsg);
taosMemoryFree(serialized); sTrace("syncClientRequestLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized);
taosMemoryFree(serialized);
}
} }
// ---- message process SyncRequestVote---- // ---- message process SyncRequestVote----
...@@ -1084,9 +1094,11 @@ void syncRequestVoteLog(const SyncRequestVote* pMsg) { ...@@ -1084,9 +1094,11 @@ void syncRequestVoteLog(const SyncRequestVote* pMsg) {
} }
void syncRequestVoteLog2(char* s, const SyncRequestVote* pMsg) { void syncRequestVoteLog2(char* s, const SyncRequestVote* pMsg) {
char* serialized = syncRequestVote2Str(pMsg); if (gRaftDetailLog) {
sTrace("syncRequestVoteLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized); char* serialized = syncRequestVote2Str(pMsg);
taosMemoryFree(serialized); sTrace("syncRequestVoteLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized);
taosMemoryFree(serialized);
}
} }
// ---- message process SyncRequestVoteReply---- // ---- message process SyncRequestVoteReply----
...@@ -1230,9 +1242,11 @@ void syncRequestVoteReplyLog(const SyncRequestVoteReply* pMsg) { ...@@ -1230,9 +1242,11 @@ void syncRequestVoteReplyLog(const SyncRequestVoteReply* pMsg) {
} }
void syncRequestVoteReplyLog2(char* s, const SyncRequestVoteReply* pMsg) { void syncRequestVoteReplyLog2(char* s, const SyncRequestVoteReply* pMsg) {
char* serialized = syncRequestVoteReply2Str(pMsg); if (gRaftDetailLog) {
sTrace("syncRequestVoteReplyLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized); char* serialized = syncRequestVoteReply2Str(pMsg);
taosMemoryFree(serialized); sTrace("syncRequestVoteReplyLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized);
taosMemoryFree(serialized);
}
} }
// ---- message process SyncAppendEntries---- // ---- message process SyncAppendEntries----
...@@ -1399,9 +1413,11 @@ void syncAppendEntriesLog(const SyncAppendEntries* pMsg) { ...@@ -1399,9 +1413,11 @@ void syncAppendEntriesLog(const SyncAppendEntries* pMsg) {
} }
void syncAppendEntriesLog2(char* s, const SyncAppendEntries* pMsg) { void syncAppendEntriesLog2(char* s, const SyncAppendEntries* pMsg) {
char* serialized = syncAppendEntries2Str(pMsg); if (gRaftDetailLog) {
sTrace("syncAppendEntriesLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized); char* serialized = syncAppendEntries2Str(pMsg);
taosMemoryFree(serialized); sTrace("syncAppendEntriesLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized);
taosMemoryFree(serialized);
}
} }
// ---- message process SyncAppendEntriesReply---- // ---- message process SyncAppendEntriesReply----
...@@ -1551,9 +1567,11 @@ void syncAppendEntriesReplyLog(const SyncAppendEntriesReply* pMsg) { ...@@ -1551,9 +1567,11 @@ void syncAppendEntriesReplyLog(const SyncAppendEntriesReply* pMsg) {
} }
void syncAppendEntriesReplyLog2(char* s, const SyncAppendEntriesReply* pMsg) { void syncAppendEntriesReplyLog2(char* s, const SyncAppendEntriesReply* pMsg) {
char* serialized = syncAppendEntriesReply2Str(pMsg); if (gRaftDetailLog) {
sTrace("syncAppendEntriesReplyLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized); char* serialized = syncAppendEntriesReply2Str(pMsg);
taosMemoryFree(serialized); sTrace("syncAppendEntriesReplyLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized);
taosMemoryFree(serialized);
}
} }
// ---- message process SyncApplyMsg---- // ---- message process SyncApplyMsg----
...@@ -1702,9 +1720,11 @@ void syncApplyMsgLog(const SyncApplyMsg* pMsg) { ...@@ -1702,9 +1720,11 @@ void syncApplyMsgLog(const SyncApplyMsg* pMsg) {
} }
void syncApplyMsgLog2(char* s, const SyncApplyMsg* pMsg) { void syncApplyMsgLog2(char* s, const SyncApplyMsg* pMsg) {
char* serialized = syncApplyMsg2Str(pMsg); if (gRaftDetailLog) {
sTrace("syncApplyMsgLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized); char* serialized = syncApplyMsg2Str(pMsg);
taosMemoryFree(serialized); sTrace("syncApplyMsgLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized);
taosMemoryFree(serialized);
}
} }
// --------------------------------------------- // ---------------------------------------------
...@@ -1870,9 +1890,11 @@ void syncSnapshotSendLog(const SyncSnapshotSend* pMsg) { ...@@ -1870,9 +1890,11 @@ void syncSnapshotSendLog(const SyncSnapshotSend* pMsg) {
} }
void syncSnapshotSendLog2(char* s, const SyncSnapshotSend* pMsg) { void syncSnapshotSendLog2(char* s, const SyncSnapshotSend* pMsg) {
char* serialized = syncSnapshotSend2Str(pMsg); if (gRaftDetailLog) {
sTrace("syncSnapshotSendLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized); char* serialized = syncSnapshotSend2Str(pMsg);
taosMemoryFree(serialized); sTrace("syncSnapshotSendLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized);
taosMemoryFree(serialized);
}
} }
// --------------------------------------------- // ---------------------------------------------
...@@ -2028,7 +2050,9 @@ void syncSnapshotRspLog(const SyncSnapshotRsp* pMsg) { ...@@ -2028,7 +2050,9 @@ void syncSnapshotRspLog(const SyncSnapshotRsp* pMsg) {
} }
void syncSnapshotRspLog2(char* s, const SyncSnapshotRsp* pMsg) { void syncSnapshotRspLog2(char* s, const SyncSnapshotRsp* pMsg) {
char* serialized = syncSnapshotRsp2Str(pMsg); if (gRaftDetailLog) {
sTrace("syncSnapshotRspLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized); char* serialized = syncSnapshotRsp2Str(pMsg);
taosMemoryFree(serialized); sTrace("syncSnapshotRspLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized);
taosMemoryFree(serialized);
}
} }
\ No newline at end of file
...@@ -583,7 +583,9 @@ void logStoreSimpleLog(SSyncLogStore* pLogStore) { ...@@ -583,7 +583,9 @@ void logStoreSimpleLog(SSyncLogStore* pLogStore) {
} }
void logStoreSimpleLog2(char* s, SSyncLogStore* pLogStore) { void logStoreSimpleLog2(char* s, SSyncLogStore* pLogStore) {
char* serialized = logStoreSimple2Str(pLogStore); if (gRaftDetailLog) {
sTrace("logStoreSimpleLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized); char* serialized = logStoreSimple2Str(pLogStore);
taosMemoryFree(serialized); sTrace("logStoreSimpleLog2 | len:%lu | %s | %s", strlen(serialized), s, serialized);
taosMemoryFree(serialized);
}
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册