提交 4d635478 编写于 作者: L Liu Jicong

fix

上级 29cb7c67
...@@ -96,8 +96,9 @@ static void* hbThreadFunc(void* param) { ...@@ -96,8 +96,9 @@ static void* hbThreadFunc(void* param) {
SClientHbBatchReq* pReq = hbGatherAllInfo(); SClientHbBatchReq* pReq = hbGatherAllInfo();
void* reqStr = NULL; void* reqStr = NULL;
tSerializeSClientHbBatchReq(&reqStr, pReq); int tlen = tSerializeSClientHbBatchReq(&reqStr, pReq);
SMsgSendInfo info; SMsgSendInfo info;
/*info.fp = hbHandleRsp;*/
int64_t transporterId = 0; int64_t transporterId = 0;
asyncSendMsgToServer(clientHbMgr.transporter, &clientHbMgr.epSet, &transporterId, &info); asyncSendMsgToServer(clientHbMgr.transporter, &clientHbMgr.epSet, &transporterId, &info);
......
...@@ -37,7 +37,7 @@ int tSerializeSClientHbReq(void **buf, const SClientHbReq *pReq) { ...@@ -37,7 +37,7 @@ int tSerializeSClientHbReq(void **buf, const SClientHbReq *pReq) {
taosHashGetKey(pIter, &kv.key, (size_t *)&kv.keyLen); taosHashGetKey(pIter, &kv.key, (size_t *)&kv.keyLen);
kv.valueLen = taosHashGetDataLen(pIter); kv.valueLen = taosHashGetDataLen(pIter);
kv.value = pIter; kv.value = pIter;
taosEncodeSKv(buf, &kv); tlen += taosEncodeSKv(buf, &kv);
pIter = taosHashIterate(pReq->info, pIter); pIter = taosHashIterate(pReq->info, pIter);
} }
......
...@@ -244,6 +244,7 @@ int walRoll(SWal *pWal) { ...@@ -244,6 +244,7 @@ int walRoll(SWal *pWal) {
pWal->writeIdxTfd = idxTfd; pWal->writeIdxTfd = idxTfd;
pWal->writeLogTfd = logTfd; pWal->writeLogTfd = logTfd;
pWal->writeCur = taosArrayGetSize(pWal->fileInfoSet) - 1; pWal->writeCur = taosArrayGetSize(pWal->fileInfoSet) - 1;
ASSERT(pWal->writeCur >= 0);
pWal->lastRollSeq = walGetSeq(); pWal->lastRollSeq = walGetSeq();
return 0; return 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册