make min diff with develop
This commit is contained in:
parent
2b44c08f68
commit
027131231c
|
@ -124,11 +124,11 @@ void taos_init_imp(void) {
|
|||
}
|
||||
|
||||
tscTmr = taosTmrInit(tsMaxConnections * 2, 200, 60000, "TSC");
|
||||
if (0 == tscEmbedded) {
|
||||
taosTmrReset(tscCheckDiskUsage, 10, NULL, tscTmr, &tscCheckDiskUsageTmr);
|
||||
if(0 == tscEmbedded){
|
||||
taosTmrReset(tscCheckDiskUsage, 10, NULL, tscTmr, &tscCheckDiskUsageTmr);
|
||||
}
|
||||
|
||||
int64_t refreshTime = 10; // 10 seconds by default
|
||||
int64_t refreshTime = 10; // 10 seconds by default
|
||||
if (tscMetaCache == NULL) {
|
||||
tscMetaCache = taosCacheInit(TSDB_DATA_TYPE_BINARY, refreshTime, false, tscFreeTableMetaHelper, "tableMeta");
|
||||
tscObjRef = taosOpenRef(40960, tscFreeRegisteredSqlObj);
|
||||
|
|
|
@ -30,4 +30,4 @@ void dnodeSendStartupStep(SRpcMsg *pMsg);
|
|||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif
|
|
@ -29,4 +29,4 @@ void dnodeDispatchToVMgmtQueue(SRpcMsg *rpcMsg);
|
|||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif
|
|
@ -31,4 +31,4 @@ void dnodeSendStatusMsgToMnode();
|
|||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif
|
|
@ -305,7 +305,7 @@ void dnodeSendRedirectMsg(SRpcMsg *rpcMsg, bool forShell) {
|
|||
} else {
|
||||
dnodeGetEpSetForPeer(&epSet);
|
||||
}
|
||||
|
||||
|
||||
dDebug("msg:%s will be redirected, dnodeIp:%s user:%s, numOfEps:%d inUse:%d", taosMsg[rpcMsg->msgType],
|
||||
taosIpStr(connInfo.clientIp), connInfo.user, epSet.numOfEps, epSet.inUse);
|
||||
|
||||
|
@ -323,4 +323,4 @@ void dnodeSendRedirectMsg(SRpcMsg *rpcMsg, bool forShell) {
|
|||
}
|
||||
|
||||
rpcSendRedirectRsp(rpcMsg->handle, &epSet);
|
||||
}
|
||||
}
|
|
@ -231,4 +231,4 @@ SStatisInfo dnodeGetStatisInfo() {
|
|||
}
|
||||
|
||||
return info;
|
||||
}
|
||||
}
|
|
@ -71,4 +71,4 @@ int32_t dnodeStepInit(SStep *pSteps, int32_t stepSize) {
|
|||
|
||||
void dnodeStepCleanup(SStep *pSteps, int32_t stepSize) {
|
||||
return taosStepCleanupImp(pSteps, stepSize - 1);
|
||||
}
|
||||
}
|
|
@ -271,7 +271,7 @@ static void dnodeSendStatusMsg(void *handle, void *tmrId) {
|
|||
vnodeBuildStatusMsg(pStatus);
|
||||
contLen = sizeof(SStatusMsg) + pStatus->openVnodes * sizeof(SVnodeLoad);
|
||||
pStatus->openVnodes = htons(pStatus->openVnodes);
|
||||
|
||||
|
||||
SRpcMsg rpcMsg = {
|
||||
.pCont = pStatus,
|
||||
.contLen = contLen,
|
||||
|
@ -288,4 +288,4 @@ void dnodeSendStatusMsgToMnode() {
|
|||
dInfo("force send status msg to mnode");
|
||||
taosTmrReset(dnodeSendStatusMsg, 3, NULL, tsDnodeTmr, &tsStatusTimer);
|
||||
}
|
||||
}
|
||||
}
|
|
@ -89,4 +89,4 @@ int32_t vnodeProcessRead(void *pVnode, SVReadMsg *pRead);
|
|||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif
|
|
@ -35,4 +35,4 @@ void vnodeDestroy(SVnodeObj *pVnode);
|
|||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif
|
|
@ -44,4 +44,4 @@ bool vnodeInResetStatus(SVnodeObj* pVnode);
|
|||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif
|
|
@ -36,4 +36,4 @@ void vnodeConfirmForward(void *pVnode, uint64_t version, int32_t code);
|
|||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif
|
|
@ -30,4 +30,4 @@ int32_t vnodeDestroyInMWorker(SVnodeObj *pVnode);
|
|||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif
|
|
@ -32,4 +32,4 @@ int32_t vnodeProcessWrite(void *pVnode, void *pHead, int32_t qtype, void *pRspRe
|
|||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif
|
|
@ -194,4 +194,4 @@ void vnodeSetAccess(SVgroupAccess *pAccess, int32_t numOfVnodes) {
|
|||
vnodeRelease(pVnode);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue