xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[TD-17] fix error while alloc vnodes

This commit is contained in:
slguan 2020-04-02 11:00:00 +08:00
parent 05f5d742c4
commit 61b2342b05
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/define.inc
View File

@ -3,7 +3,7 @@ PROJECT(TDengine)
IF (TD_CLUSTER)
ADD_DEFINITIONS(-D_CLUSTER)
ADD_DEFINITIONS(-DTSDB_REPLICA_MAX_NUM=3)
ADD_DEFINITIONS(-DTSDB_REPLICA_MAX_NUM=1)
ELSE ()
ADD_DEFINITIONS(-DLITE)
ADD_DEFINITIONS(-DTSDB_REPLICA_MAX_NUM=1)

2
src/mnode/src/mgmtBalance.c
View File

@ -42,7 +42,7 @@ int32_t mgmtAllocVnodes(SVgObj *pVgroup) {
}
if (pSelDnode == NULL) {
mError("failed to alloc vnode to vgroup", pDnode->dnodeId);
mError("failed to alloc vnode to vgroup");
return TSDB_CODE_NO_ENOUGH_DNODES;
}

4
src/mnode/src/mgmtDnode.c
View File

@ -35,7 +35,9 @@ extern int32_t clusterGetDnodesNum();
extern void * clusterGetNextDnode(void *pNode, SDnodeObj **pDnode);
extern SDnodeObj* clusterGetDnode(int32_t dnodeId);
extern SDnodeObj* clusterGetDnodeByIp(uint32_t ip);
#ifndef _CLUSTER
static SDnodeObj tsDnodeObj = {0};
#endif
int32_t mgmtInitDnodes() {
mgmtAddShellMsgHandle(TSDB_MSG_TYPE_CM_CONFIG_DNODE, mgmtProcessCfgDnodeMsg);
@ -101,7 +103,7 @@ int32_t mgmtGetDnodesNum() {
void * mgmtGetNextDnode(void *pNode, SDnodeObj **pDnode) {
#ifdef _CLUSTER
return (*clusterGetNextDnode)(pNode, pDnode);
return clusterGetNextDnode(pNode, pDnode);
#else
if (*pDnode == NULL) {
*pDnode = &tsDnodeObj;