diff --git a/.travis.yml b/.travis.yml index 7df3a7d7fe..37e6e5a6c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,15 +32,15 @@ matrix: - cd debug script: - - cmake .. - - make + - cmake .. > /dev/null + - make > /dev/null after_success: - |- case $TRAVIS_OS_NAME in linux) cd ${TRAVIS_BUILD_DIR}/debug - make install || travis_terminate $? + make install > /dev/null || travis_terminate $? pip install --user ${TRAVIS_BUILD_DIR}/src/connector/python/linux/python2/ pip3 install --user ${TRAVIS_BUILD_DIR}/src/connector/python/linux/python3/ @@ -98,11 +98,11 @@ matrix: # Commands to prepare for build_command # ** likely specific to your build ** - build_command_prepend: cmake . + build_command_prepend: cmake . > /dev/null # The command that will be added as an argument to "cov-build" to compile your project for analysis, # ** likely specific to your build ** - build_command: make + build_command: make > /dev/null # Pattern to match selecting branches that will run analysis. We recommend leaving this set to 'coverity_scan'. # Take care in resource usage, and consider the build frequency allowances per @@ -135,15 +135,15 @@ matrix: - cd debug script: - - cmake -DCOVER=true .. - - make + - cmake -DCOVER=true .. > /dev/null + - make > /dev/null after_success: - |- case $TRAVIS_OS_NAME in linux) cd ${TRAVIS_BUILD_DIR}/debug - make install || travis_terminate $? + make install > /dev/null || travis_terminate $? pip install --user ${TRAVIS_BUILD_DIR}/src/connector/python/linux/python2/ pip3 install --user ${TRAVIS_BUILD_DIR}/src/connector/python/linux/python3/ @@ -208,8 +208,8 @@ matrix: - cd debug script: - - cmake .. - - make + - cmake .. > /dev/null + - make > /dev/null # - os: osx # language: c @@ -225,5 +225,5 @@ matrix: # - cd ${TRAVIS_BUILD_DIR} # - mkdir debug # - cd debug - # - cmake .. - # - make + # - cmake .. > /dev/null + # - make > /dev/null diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index 5590ac5a01..79188203da 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -304,10 +304,11 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) { } SSQLToken* pIpAddr = &pInfo->pDCLInfo->a[0]; - if (!validateIpAddress(pIpAddr->z, pIpAddr->n)) { - return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg); - } + // if (!validateIpAddress(pIpAddr->z, pIpAddr->n)) { + // return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg); + // } + pIpAddr->n = strdequote(pIpAddr->z); break; } @@ -385,7 +386,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) { pMsg += sizeof(SMgmtHead); SCMCfgDnodeMsg* pCfg = (SCMCfgDnodeMsg*)pMsg; - strncpy(pCfg->ip, pDCL->a[0].z, pDCL->a[0].n); + strncpy(pCfg->ep, pDCL->a[0].z, pDCL->a[0].n); strncpy(pCfg->config, pDCL->a[1].z, pDCL->a[1].n); diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c index 0d33bec38d..9b44bea82d 100644 --- a/src/client/src/tscServer.c +++ b/src/client/src/tscServer.c @@ -49,11 +49,11 @@ static void tscSetDnodeIpList(SSqlObj* pSql, STableMeta* pTableMeta) { SRpcIpSet* pIpList = &pSql->ipList; pIpList->numOfIps = pTableMeta->vgroupInfo.numOfIps; - pIpList->port = tsDnodeShellPort; pIpList->inUse = 0; for(int32_t i = 0; i < pTableMeta->vgroupInfo.numOfIps; ++i) { - pIpList->ip[i] = pTableMeta->vgroupInfo.ipAddr[i].ip; + strcpy(pIpList->fqdn[i], pTableMeta->vgroupInfo.ipAddr[i].fqdn); + pIpList->port[i] = pTableMeta->vgroupInfo.ipAddr[i].port; } } @@ -62,7 +62,7 @@ void tscPrintMgmtIp() { tscError("invalid mgmt IP list:%d", tscMgmtIpSet.numOfIps); } else { for (int i = 0; i < tscMgmtIpSet.numOfIps; ++i) { - tscTrace("mgmt index:%d ip:%d", i, tscMgmtIpSet.ip[i]); + tscTrace("mgmt index:%d %s:%d", i, tscMgmtIpSet.fqdn[i], tscMgmtIpSet.port[i]); } } } @@ -70,9 +70,8 @@ void tscPrintMgmtIp() { void tscSetMgmtIpListFromCluster(SRpcIpSet *pIpList) { tscMgmtIpSet.numOfIps = pIpList->numOfIps; tscMgmtIpSet.inUse = pIpList->inUse; - tscMgmtIpSet.port = htons(pIpList->port); for (int32_t i = 0; i < tscMgmtIpSet.numOfIps; ++i) { - tscMgmtIpSet.ip[i] = htonl(pIpList->ip[i]); + tscMgmtIpSet.port[i] = htons(pIpList->port[i]); } } @@ -80,8 +79,7 @@ void tscSetMgmtIpListFromEdge() { if (tscMgmtIpSet.numOfIps != 1) { tscMgmtIpSet.numOfIps = 1; tscMgmtIpSet.inUse = 0; - tscMgmtIpSet.port = tsMnodeShellPort; - tscMgmtIpSet.ip[0] = inet_addr(tsMasterIp); + taosGetFqdnPortFromEp(tsFirst, tscMgmtIpSet.fqdn[0], &tscMgmtIpSet.port[0]); tscTrace("edge mgmt IP list:"); tscPrintMgmtIp(); } @@ -213,9 +211,6 @@ int tscSendMsgToServer(SSqlObj *pSql) { rpcSendRequest(pVnodeConn, &pSql->ipList, &rpcMsg); } else { pSql->ipList = tscMgmtIpSet; - pSql->ipList.port = tsMnodeShellPort; - - tscTrace("%p msg:%s is sent to server %d", pSql, taosMsg[pSql->cmd.msgType], pSql->ipList.port); memcpy(pMsg, pSql->cmd.payload, pSql->cmd.payloadLen); SRpcMsg rpcMsg = { .msgType = pSql->cmd.msgType, @@ -224,6 +219,7 @@ int tscSendMsgToServer(SSqlObj *pSql) { .handle = pSql, .code = 0 }; + tscTrace("%p msg:%s is sent to server", pSql, taosMsg[pSql->cmd.msgType]); rpcSendRequest(pObj->pMgmtConn, &pSql->ipList, &rpcMsg); } @@ -294,11 +290,6 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg) { } } } - - if (pRes->code == TSDB_CODE_SUCCESS) { - tscTrace("%p reset retry counter to be 0 due to success rsp, old:%d", pSql, pSql->retry); - pSql->retry = 0; - } pRes->rspLen = 0; @@ -308,6 +299,11 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg) { tscTrace("%p query is cancelled, code:%d", pSql, tstrerror(pRes->code)); } + if (pRes->code == TSDB_CODE_SUCCESS) { + tscTrace("%p reset retry counter to be 0 due to success rsp, old:%d", pSql, pSql->retry); + pSql->retry = 0; + } + if (pRes->code != TSDB_CODE_QUERY_CANCELLED) { assert(rpcMsg->msgType == pCmd->msgType + 1); pRes->code = rpcMsg->code; @@ -569,7 +565,7 @@ int tscBuildSubmitMsg(SSqlObj *pSql, SSqlInfo *pInfo) { pSql->cmd.msgType = TSDB_MSG_TYPE_SUBMIT; tscSetDnodeIpList(pSql, pTableMeta); - tscTrace("%p build submit msg, vgId:%d numOfVgroup:%d", pSql, vgId, htonl(pMsgDesc->numOfVnodes)); + tscTrace("%p build submit msg, vgId:%d numOfVgroup:%d numberOfIP:%d", pSql, vgId, htonl(pMsgDesc->numOfVnodes), pSql->ipList.numOfIps); return TSDB_CODE_SUCCESS; } @@ -664,11 +660,11 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) { SCMVgroupInfo* pVgroupInfo = &pTableMetaInfo->vgroupList->vgroups[index]; pSql->ipList.numOfIps = pVgroupInfo->numOfIps; // todo fix me - pSql->ipList.port = tsDnodeShellPort; pSql->ipList.inUse = 0; for(int32_t i = 0; i < pVgroupInfo->numOfIps; ++i) { - pSql->ipList.ip[i] = pVgroupInfo->ipAddr[i].ip; + strcpy(pSql->ipList.fqdn[i], pVgroupInfo->ipAddr[i].fqdn); + pSql->ipList.port[i] = pVgroupInfo->ipAddr[i].port; } tscTrace("%p query on super table, numOfVgroup:%d, vgroupIndex:%d", pSql, pTableMetaInfo->vgroupList->numOfVgroups, index); @@ -935,7 +931,8 @@ int32_t tscBuildCreateDnodeMsg(SSqlObj *pSql, SSqlInfo *pInfo) { } SCMCreateDnodeMsg *pCreate = (SCMCreateDnodeMsg *)pCmd->payload; - strncpy(pCreate->ip, pInfo->pDCLInfo->a[0].z, pInfo->pDCLInfo->a[0].n); + strncpy(pCreate->ep, pInfo->pDCLInfo->a[0].z, pInfo->pDCLInfo->a[0].n); + pCmd->msgType = TSDB_MSG_TYPE_CM_CREATE_DNODE; return TSDB_CODE_SUCCESS; @@ -1078,7 +1075,7 @@ int32_t tscBuildDropDnodeMsg(SSqlObj *pSql, SSqlInfo *pInfo) { SCMDropDnodeMsg *pDrop = (SCMDropDnodeMsg *)pCmd->payload; STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0); - strcpy(pDrop->ip, pTableMetaInfo->name); + strcpy(pDrop->ep, pTableMetaInfo->name); pCmd->msgType = TSDB_MSG_TYPE_CM_DROP_DNODE; return TSDB_CODE_SUCCESS; @@ -1857,10 +1854,7 @@ int tscProcessTableMetaRsp(SSqlObj *pSql) { } for (int i = 0; i < pMetaMsg->vgroup.numOfIps; ++i) { - pMetaMsg->vgroup.ipAddr[i].ip = htonl(pMetaMsg->vgroup.ipAddr[i].ip); pMetaMsg->vgroup.ipAddr[i].port = htons(pMetaMsg->vgroup.ipAddr[i].port); - - assert(pMetaMsg->vgroup.ipAddr[i].ip != 0); } SSchema* pSchema = pMetaMsg->schema; @@ -2144,7 +2138,6 @@ _error_clean: assert(pVgroups->numOfIps >= 1); for(int32_t j = 0; j < pVgroups->numOfIps; ++j) { - pVgroups->ipAddr[j].ip = htonl(pVgroups->ipAddr[j].ip); pVgroups->ipAddr[j].port = htons(pVgroups->ipAddr[j].port); } } diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c index 9b8303acfb..1934c05014 100644 --- a/src/client/src/tscSql.c +++ b/src/client/src/tscSql.c @@ -72,24 +72,24 @@ STscObj *taosConnectImpl(const char *ip, const char *user, const char *pass, con return NULL; } + tscMgmtIpSet.numOfIps = 0; + if (ip && ip[0]) { tscMgmtIpSet.inUse = 0; - tscMgmtIpSet.port = tsMnodeShellPort; tscMgmtIpSet.numOfIps = 1; - tscMgmtIpSet.ip[0] = inet_addr(ip); - - if (tsMasterIp[0] && strcmp(ip, tsMasterIp) != 0) { - tscMgmtIpSet.numOfIps = 2; - tscMgmtIpSet.ip[1] = inet_addr(tsMasterIp); + strcpy(tscMgmtIpSet.fqdn[0], ip); + tscMgmtIpSet.port[0] = port? port: tsMnodeShellPort; + } else { + if (tsFirst[0] != 0) { + taosGetFqdnPortFromEp(tsFirst, tscMgmtIpSet.fqdn[tscMgmtIpSet.numOfIps], &tscMgmtIpSet.port[tscMgmtIpSet.numOfIps]); + tscMgmtIpSet.numOfIps++; } - if (tsSecondIp[0] && strcmp(tsSecondIp, tsMasterIp) != 0) { - tscMgmtIpSet.numOfIps = 3; - tscMgmtIpSet.ip[2] = inet_addr(tsSecondIp); + if (tsSecond[0] != 0) { + taosGetFqdnPortFromEp(tsSecond, tscMgmtIpSet.fqdn[tscMgmtIpSet.numOfIps], &tscMgmtIpSet.port[tscMgmtIpSet.numOfIps]); + tscMgmtIpSet.numOfIps++; } } - - tscMgmtIpSet.port = port ? port : tsMnodeShellPort; STscObj *pObj = (STscObj *)calloc(1, sizeof(STscObj)); if (NULL == pObj) { @@ -167,10 +167,6 @@ static void syncConnCallback(void *param, TAOS_RES *tres, int code) { } TAOS *taos_connect(const char *ip, const char *user, const char *pass, const char *db, uint16_t port) { - if (ip == NULL || (ip != NULL && (strcmp("127.0.0.1", ip) == 0 || strcasecmp("localhost", ip) == 0))) { - ip = tsMasterIp; - } - tscTrace("try to create a connection to %s", ip); STscObj *pObj = taosConnectImpl(ip, user, pass, db, port, NULL, NULL, NULL); @@ -939,7 +935,7 @@ char *taos_errstr(TAOS *taos) { void taos_config(int debug, char *log_path) { uDebugFlag = debug; - strcpy(logDir, log_path); + strcpy(tsLogDir, log_path); } char *taos_get_server_info(TAOS *taos) { diff --git a/src/client/src/tscSub.c b/src/client/src/tscSub.c index d938bb0576..7b40d69f1b 100644 --- a/src/client/src/tscSub.c +++ b/src/client/src/tscSub.c @@ -220,7 +220,7 @@ int tscUpdateSubscription(STscObj* pObj, SSub* pSub) { static int tscLoadSubscriptionProgress(SSub* pSub) { char buf[TSDB_MAX_SQL_LEN]; - sprintf(buf, "%s/subscribe/%s", dataDir, pSub->topic); + sprintf(buf, "%s/subscribe/%s", tsDataDir, pSub->topic); FILE* fp = fopen(buf, "r"); if (fp == NULL) { @@ -281,12 +281,12 @@ void tscSaveSubscriptionProgress(void* sub) { SSub* pSub = (SSub*)sub; char path[256]; - sprintf(path, "%s/subscribe", dataDir); + sprintf(path, "%s/subscribe", tsDataDir); if (access(path, 0) != 0) { mkdir(path, 0777); } - sprintf(path, "%s/subscribe/%s", dataDir, pSub->topic); + sprintf(path, "%s/subscribe/%s", tsDataDir, pSub->topic); FILE* fp = fopen(path, "w+"); if (fp == NULL) { tscError("failed to create progress file for subscription: %s", pSub->topic); @@ -416,7 +416,7 @@ void taos_unsubscribe(TAOS_SUB *tsub, int keepProgress) { tscSaveSubscriptionProgress(pSub); } else { char path[256]; - sprintf(path, "%s/subscribe/%s", dataDir, pSub->topic); + sprintf(path, "%s/subscribe/%s", tsDataDir, pSub->topic); remove(path); } diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c index 856c28eaff..68029ac719 100644 --- a/src/client/src/tscSubquery.c +++ b/src/client/src/tscSubquery.c @@ -1245,7 +1245,7 @@ static void tscAllDataRetrievedFromDnode(SRetrieveSupport *trsupport, SSqlObj* p // data in from current vnode is stored in cache and disk uint32_t numOfRowsFromSubquery = trsupport->pExtMemBuffer[idx]->numOfTotalElems + trsupport->localBuffer->numOfElems; tscTrace("%p sub:%p all data retrieved from ip:%u,vgId:%d, numOfRows:%d, orderOfSub:%d", pPObj, pSql, - pTableMetaInfo->vgroupList->vgroups[0].ipAddr[0].ip, pTableMetaInfo->vgroupList->vgroups[0].vgId, + pTableMetaInfo->vgroupList->vgroups[0].ipAddr[0].fqdn, pTableMetaInfo->vgroupList->vgroups[0].vgId, numOfRowsFromSubquery, idx); tColModelCompact(pDesc->pColumnModel, trsupport->localBuffer, pDesc->pColumnModel->capacity); @@ -1473,12 +1473,12 @@ void tscRetrieveDataRes(void *param, TAOS_RES *tres, int code) { if (pState->code != TSDB_CODE_SUCCESS) { // at least one peer subquery failed, abort current query tscTrace("%p sub:%p query failed,ip:%u,vgId:%d,orderOfSub:%d,global code:%d", pParentSql, pSql, - pVgroup->ipAddr[0].ip, pVgroup->vgId, trsupport->subqueryIndex, pState->code); + pVgroup->ipAddr[0].fqdn, pVgroup->vgId, trsupport->subqueryIndex, pState->code); tscHandleSubqueryError(param, tres, pState->code); } else { // success, proceed to retrieve data from dnode tscTrace("%p sub:%p query complete, ip:%u, vgId:%d, orderOfSub:%d, retrieve data", trsupport->pParentSqlObj, pSql, - pVgroup->ipAddr[0].ip, pVgroup->vgId, trsupport->subqueryIndex); + pVgroup->ipAddr[0].fqdn, pVgroup->vgId, trsupport->subqueryIndex); if (pSql->res.qhandle == 0) { // qhandle is NULL, code is TSDB_CODE_SUCCESS means no results generated from this vnode tscRetrieveFromDnodeCallBack(param, pSql, 0); diff --git a/src/client/src/tscSystem.c b/src/client/src/tscSystem.c index 75ab9fc720..c0ad91cd59 100644 --- a/src/client/src/tscSystem.c +++ b/src/client/src/tscSystem.c @@ -55,7 +55,6 @@ int32_t tscInitRpc(const char *user, const char *secret, void** pMgmtConn) { if (pVnodeConn == NULL) { memset(&rpcInit, 0, sizeof(rpcInit)); - rpcInit.localIp = tsLocalIp; rpcInit.localPort = 0; rpcInit.label = "TSC-vnode"; rpcInit.numOfThreads = tscNumOfThreads; @@ -76,7 +75,6 @@ int32_t tscInitRpc(const char *user, const char *secret, void** pMgmtConn) { if (*pMgmtConn == NULL) { memset(&rpcInit, 0, sizeof(rpcInit)); - rpcInit.localIp = tsLocalIp; rpcInit.localPort = 0; rpcInit.label = "TSC-mgmt"; rpcInit.numOfThreads = 1; @@ -109,23 +107,17 @@ void taos_init_imp() { deltaToUtcInitOnce(); if (tscEmbedded == 0) { - /* - * set localIp = 0 - * means unset tsLocalIp in client - * except read from config file - */ - strcpy(tsLocalIp, "0.0.0.0"); // Read global configuration. taosInitGlobalCfg(); taosReadGlobalLogCfg(); // For log directory - if (stat(logDir, &dirstat) < 0) mkdir(logDir, 0755); + if (stat(tsLogDir, &dirstat) < 0) mkdir(tsLogDir, 0755); - sprintf(temp, "%s/taoslog", logDir); + sprintf(temp, "%s/taoslog", tsLogDir); if (taosInitLog(temp, tsNumOfLogLines, 10) < 0) { - printf("failed to open log file in directory:%s\n", logDir); + printf("failed to open log file in directory:%s\n", tsLogDir); } taosReadGlobalCfg(); @@ -133,7 +125,7 @@ void taos_init_imp() { taosPrintGlobalCfg(); tscTrace("starting to initialize TAOS client ..."); - tscTrace("Local IP address is:%s", tsLocalIp); + tscTrace("Local End Point is:%s", tsLocalEp); } taosSetCoreDump(); @@ -143,13 +135,12 @@ void taos_init_imp() { } tscMgmtIpSet.inUse = 0; - tscMgmtIpSet.port = tsMnodeShellPort; tscMgmtIpSet.numOfIps = 1; - tscMgmtIpSet.ip[0] = inet_addr(tsMasterIp); + taosGetFqdnPortFromEp(tsFirst, tscMgmtIpSet.fqdn[0], &tscMgmtIpSet.port[0]); - if (tsSecondIp[0] && strcmp(tsSecondIp, tsMasterIp) != 0) { + if (tsSecond[0] && strcmp(tsSecond, tsFirst) != 0) { tscMgmtIpSet.numOfIps = 2; - tscMgmtIpSet.ip[1] = inet_addr(tsSecondIp); + taosGetFqdnPortFromEp(tsSecond, tscMgmtIpSet.fqdn[1], &tscMgmtIpSet.port[1]); } tscInitMsgsFp(); diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c index 88ce13e560..c0cfa4d3af 100644 --- a/src/client/src/tscUtil.c +++ b/src/client/src/tscUtil.c @@ -631,47 +631,44 @@ int32_t tscGetDataBlockFromList(void* pHashList, SDataBlockList* pDataBlockList, return TSDB_CODE_SUCCESS; } -static void trimDataBlock(void* pDataBlock, STableDataBlocks* pTableDataBlock) { - int32_t firstPartLen = 0; - - STableMeta* pTableMeta = pTableDataBlock->pTableMeta; +static int trimDataBlock(void* pDataBlock, STableDataBlocks* pTableDataBlock) { + // TODO: optimize this function + int len = 0; + + STableMeta* pTableMeta = pTableDataBlock->pTableMeta; STableComInfo tinfo = tscGetTableInfo(pTableMeta); - SSchema* pSchema = tscGetTableSchema(pTableMeta); - + SSchema* pSchema = tscGetTableSchema(pTableMeta); + + SSubmitBlk* pBlock = pDataBlock; memcpy(pDataBlock, pTableDataBlock->pData, sizeof(SSubmitBlk)); pDataBlock += sizeof(SSubmitBlk); - - int32_t total = sizeof(int32_t)*2; - for(int32_t i = 0; i < tinfo.numOfColumns; ++i) { - switch (pSchema[i].type) { - case TSDB_DATA_TYPE_NCHAR: - case TSDB_DATA_TYPE_BINARY: { - assert(0); // not support binary yet - firstPartLen += sizeof(int32_t);break; - } - default: - firstPartLen += tDataTypeDesc[pSchema[i].type].nSize; - total += tDataTypeDesc[pSchema[i].type].nSize; - } + + int32_t flen = 0; + for (int32_t i = 0; i < tinfo.numOfColumns; ++i) { + flen += TYPE_BYTES[pSchema[i].type]; } - + char* p = pTableDataBlock->pData + sizeof(SSubmitBlk); - - SSubmitBlk* pBlock = (SSubmitBlk*) pTableDataBlock->pData; - int32_t rows = htons(pBlock->numOfRows); - - for(int32_t i = 0; i < rows; ++i) { - *(int32_t*) pDataBlock = total; - pDataBlock += sizeof(int32_t); - - *(int32_t*) pDataBlock = firstPartLen; - pDataBlock += sizeof(int32_t); - - memcpy(pDataBlock, p, pTableDataBlock->rowSize); - - p += pTableDataBlock->rowSize; - pDataBlock += pTableDataBlock->rowSize; + pBlock->len = 0; + for (int32_t i = 0; i < htons(pBlock->numOfRows); ++i) { + SDataRow trow = (SDataRow)pDataBlock; + dataRowSetLen(trow, TD_DATA_ROW_HEAD_SIZE + flen); + + int toffset = 0; + for (int32_t j = 0; j < tinfo.numOfColumns; j++) { + tdAppendColVal(trow, p, pSchema[j].type, pSchema[j].bytes, toffset); + toffset += TYPE_BYTES[pSchema[j].type]; + p += pSchema[j].bytes; + } + + // p += pTableDataBlock->rowSize; + pDataBlock += dataRowLen(trow); + pBlock->len += dataRowLen(trow); } + + len = pBlock->len; + pBlock->len = htonl(pBlock->len); + return len; } int32_t tscMergeTableDataBlocks(SSqlObj* pSql, SDataBlockList* pTableDataBlockList) { @@ -734,7 +731,7 @@ int32_t tscMergeTableDataBlocks(SSqlObj* pSql, SDataBlockList* pTableDataBlockLi pBlocks->len = htonl(len); // erase the empty space reserved for binary data - trimDataBlock(dataBuf->pData + dataBuf->size, pOneTableBlock); + len = trimDataBlock(dataBuf->pData + dataBuf->size, pOneTableBlock); dataBuf->size += (len + sizeof(SSubmitBlk)); dataBuf->numOfTables += 1; } diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h index 17aa19cce7..489635420a 100644 --- a/src/common/inc/tdataformat.h +++ b/src/common/inc/tdataformat.h @@ -20,6 +20,7 @@ #include #include "taosdef.h" +#include "tutil.h" #ifdef __cplusplus extern "C" { @@ -30,7 +31,7 @@ typedef struct { int8_t type; // Column type int16_t colId; // column ID int32_t bytes; // column bytes - int32_t offset; // point offset in a row data + int32_t offset; // point offset in SDataRow after the header part } STColumn; #define colType(col) ((col)->type) @@ -43,26 +44,25 @@ typedef struct { #define colSetBytes(col, b) (colBytes(col) = (b)) #define colSetOffset(col, o) (colOffset(col) = (o)) -STColumn *tdNewCol(int8_t type, int16_t colId, int16_t bytes); -void tdFreeCol(STColumn *pCol); -void tdColCpy(STColumn *dst, STColumn *src); -void tdSetCol(STColumn *pCol, int8_t type, int16_t colId, int32_t bytes); - // ----------------- TSDB SCHEMA DEFINITION typedef struct { + int totalCols; // Total columns allocated int numOfCols; // Number of columns appended - int padding; // Total columns allocated + int tlen; // maximum length of a SDataRow without the header part + int flen; // First part length in a SDataRow after the header part STColumn columns[]; } STSchema; #define schemaNCols(s) ((s)->numOfCols) +#define schemaTotalCols(s) ((s)->totalCols) +#define schemaTLen(s) ((s)->tlen) +#define schemaFLen(s) ((s)->flen) #define schemaColAt(s, i) ((s)->columns + i) STSchema *tdNewSchema(int32_t nCols); -int tdSchemaAppendCol(STSchema *pSchema, int8_t type, int16_t colId, int32_t bytes); +#define tdFreeSchema(s) tfree((s)) +int tdSchemaAddCol(STSchema *pSchema, int8_t type, int16_t colId, int32_t bytes); STSchema *tdDupSchema(STSchema *pSchema); -void tdFreeSchema(STSchema *pSchema); -void tdUpdateSchema(STSchema *pSchema); int tdGetSchemaEncodeSize(STSchema *pSchema); void * tdEncodeSchema(void *dst, STSchema *pSchema); STSchema *tdDecodeSchema(void **psrc); @@ -70,53 +70,100 @@ STSchema *tdDecodeSchema(void **psrc); // ----------------- Data row structure /* A data row, the format is like below: - * +----------+---------+---------------------------------+---------------------------------+ - * | int32_t | int32_t | | | - * +----------+---------+---------------------------------+---------------------------------+ - * | len | flen | First part | Second part | - * +----------+---------+---------------------------------+---------------------------------+ - * plen: first part length - * len: the length including sizeof(row) + sizeof(len) - * row: actual row data encoding + * |<------------------------------------- len ---------------------------------->| + * |<--Head ->|<--------- flen -------------->| | + * +----------+---------------------------------+---------------------------------+ + * | int32_t | | | + * +----------+---------------------------------+---------------------------------+ + * | len | First part | Second part | + * +----------+---------------------------------+---------------------------------+ */ typedef void *SDataRow; - -#define TD_DATA_ROW_HEAD_SIZE (2 * sizeof(int32_t)) +#define TD_DATA_ROW_HEAD_SIZE sizeof(int32_t) #define dataRowLen(r) (*(int32_t *)(r)) -#define dataRowFLen(r) (*(int32_t *)((char *)(r) + sizeof(int32_t))) -#define dataRowTuple(r) ((char *)(r) + TD_DATA_ROW_HEAD_SIZE) +#define dataRowTuple(r) POINTER_DRIFT(r, TD_DATA_ROW_HEAD_SIZE) #define dataRowKey(r) (*(TSKEY *)(dataRowTuple(r))) #define dataRowSetLen(r, l) (dataRowLen(r) = (l)) -#define dataRowSetFLen(r, l) (dataRowFLen(r) = (l)) -#define dataRowIdx(r, i) ((char *)(r) + i) #define dataRowCpy(dst, r) memcpy((dst), (r), dataRowLen(r)) -#define dataRowAt(r, idx) ((char *)(r) + (idx)) +#define dataRowMaxBytesFromSchema(s) (schemaTLen(s) + TD_DATA_ROW_HEAD_SIZE) -void tdInitDataRow(SDataRow row, STSchema *pSchema); -int tdMaxRowBytesFromSchema(STSchema *pSchema); -SDataRow tdNewDataRow(int32_t bytes, STSchema *pSchema); SDataRow tdNewDataRowFromSchema(STSchema *pSchema); void tdFreeDataRow(SDataRow row); -int tdAppendColVal(SDataRow row, void *value, STColumn *pCol); -void tdDataRowReset(SDataRow row, STSchema *pSchema); +void tdInitDataRow(SDataRow row, STSchema *pSchema); +int tdAppendColVal(SDataRow row, void *value, int8_t type, int32_t bytes, int32_t offset); SDataRow tdDataRowDup(SDataRow row); +// NOTE: offset here including the header size +static FORCE_INLINE void *tdGetRowDataOfCol(SDataRow row, int8_t type, int32_t offset) { + switch (type) { + case TSDB_DATA_TYPE_BINARY: + case TSDB_DATA_TYPE_NCHAR: + return POINTER_DRIFT(row, *(VarDataOffsetT *)POINTER_DRIFT(row, offset)); + break; + default: + return POINTER_DRIFT(row, offset); + break; + } +} + // ----------------- Data column structure typedef struct SDataCol { - int8_t type; - int16_t colId; - int bytes; - int len; - int offset; - void * pData; // Original data + int8_t type; // column type + int16_t colId; // column ID + int bytes; // column data bytes defined + int offset; // data offset in a SDataRow (including the header size) + int spaceSize; // Total space size for this column + int len; // column data length + VarDataOffsetT *dataOff; // For binary and nchar data, the offset in the data column + void * pData; // Actual data pointer } SDataCol; +static FORCE_INLINE void dataColReset(SDataCol *pDataCol) { pDataCol->len = 0; } + +void dataColInit(SDataCol *pDataCol, STColumn *pCol, void **pBuf, int maxPoints); +void dataColAppendVal(SDataCol *pCol, void *value, int numOfPoints, int maxPoints); +void dataColPopPoints(SDataCol *pCol, int pointsToPop, int numOfPoints); +void dataColSetOffset(SDataCol *pCol, int nEle); + +bool isNEleNull(SDataCol *pCol, int nEle); +void dataColSetNEleNull(SDataCol *pCol, int nEle, int maxPoints); + +// Get the data pointer from a column-wised data +static FORCE_INLINE void *tdGetColDataOfRow(SDataCol *pCol, int row) { + switch (pCol->type) { + case TSDB_DATA_TYPE_BINARY: + case TSDB_DATA_TYPE_NCHAR: + return POINTER_DRIFT(pCol->pData, pCol->dataOff[row]); + break; + + default: + return POINTER_DRIFT(pCol->pData, TYPE_BYTES[pCol->type] * row); + break; + } +} + +static FORCE_INLINE int32_t dataColGetNEleLen(SDataCol *pDataCol, int rows) { + ASSERT(rows > 0); + + switch (pDataCol->type) { + case TSDB_DATA_TYPE_BINARY: + case TSDB_DATA_TYPE_NCHAR: + return pDataCol->dataOff[rows - 1] + varDataTLen(tdGetColDataOfRow(pDataCol, rows - 1)); + break; + default: + return TYPE_BYTES[pDataCol->type] * rows; + } +} + + typedef struct { int maxRowSize; int maxCols; // max number of columns int maxPoints; // max number of points + int bufSize; + int numOfPoints; int numOfCols; // Total number of cols int sversion; // TODO: set sversion @@ -125,7 +172,7 @@ typedef struct { } SDataCols; #define keyCol(pCols) (&((pCols)->cols[0])) // Key column -#define dataColsKeyAt(pCols, idx) ((int64_t *)(keyCol(pCols)->pData))[(idx)] +#define dataColsKeyAt(pCols, idx) ((TSKEY *)(keyCol(pCols)->pData))[(idx)] #define dataColsKeyFirst(pCols) dataColsKeyAt(pCols, 0) #define dataColsKeyLast(pCols) dataColsKeyAt(pCols, (pCols)->numOfPoints - 1) diff --git a/src/common/inc/tglobal.h b/src/common/inc/tglobal.h index 69829f2ba4..7642475f70 100644 --- a/src/common/inc/tglobal.h +++ b/src/common/inc/tglobal.h @@ -24,10 +24,10 @@ extern char configDir[]; extern char tsVnodeDir[]; extern char tsDnodeDir[]; extern char tsMnodeDir[]; -extern char dataDir[]; -extern char logDir[]; -extern char scriptDir[]; -extern char osName[]; +extern char tsDataDir[]; +extern char tsLogDir[]; +extern char tsScriptDir[]; +extern char tsOsName[]; // system info extern int64_t tsPageSize; @@ -51,8 +51,10 @@ extern int32_t tsVersion; extern int32_t tscEmbedded; extern int64_t tsMsPerDay[2]; -extern char tsMasterIp[]; -extern char tsSecondIp[]; +extern char tsFirst[]; +extern char tsSecond[]; +extern char tsLocalEp[]; +extern uint16_t tsServerPort; extern uint16_t tsMnodeDnodePort; extern uint16_t tsMnodeShellPort; extern uint16_t tsDnodeShellPort; @@ -178,7 +180,8 @@ void taosInitGlobalCfg(); bool taosCheckGlobalCfg(); void taosSetAllDebugFlag(); bool taosCfgDynamicOptions(char *msg); - +int taosGetFqdnPortFromEp(char *ep, char *fqdn, uint16_t *port); + #ifdef __cplusplus } #endif diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c index aff6d7f773..7321e1c921 100644 --- a/src/common/src/tdataformat.c +++ b/src/common/src/tdataformat.c @@ -13,72 +13,7 @@ * along with this program. If not, see . */ #include "tdataformat.h" -#include "tutil.h" - -static int tdFLenFromSchema(STSchema *pSchema); - -/** - * Create a new STColumn object - * ASSUMPTIONS: VALID PARAMETERS - * - * @param type column type - * @param colId column ID - * @param bytes maximum bytes the col taken - * - * @return a STColumn object on success - * NULL for failure - */ -STColumn *tdNewCol(int8_t type, int16_t colId, int16_t bytes) { - if (!isValidDataType(type, 0)) return NULL; - - STColumn *pCol = (STColumn *)calloc(1, sizeof(STColumn)); - if (pCol == NULL) return NULL; - - colSetType(pCol, type); - colSetColId(pCol, colId); - colSetOffset(pCol, -1); - switch (type) { - case TSDB_DATA_TYPE_BINARY: - case TSDB_DATA_TYPE_NCHAR: - colSetBytes(pCol, bytes); - break; - default: - colSetBytes(pCol, TYPE_BYTES[type]); - break; - } - - return pCol; -} - -/** - * Free a STColumn object CREATED with tdNewCol - */ -void tdFreeCol(STColumn *pCol) { - if (pCol) free(pCol); -} - -/** - * Copy from source to destinition - */ -void tdColCpy(STColumn *dst, STColumn *src) { memcpy((void *)dst, (void *)src, sizeof(STColumn)); } - -/** - * Set the column - */ -void tdSetCol(STColumn *pCol, int8_t type, int16_t colId, int32_t bytes) { - colSetType(pCol, type); - colSetColId(pCol, colId); - switch (type) - { - case TSDB_DATA_TYPE_BINARY: - case TSDB_DATA_TYPE_NCHAR: - colSetBytes(pCol, bytes); - break; - default: - colSetBytes(pCol, TYPE_BYTES[type]); - break; - } -} +#include "wchar.h" /** * Create a SSchema object with nCols columns @@ -90,11 +25,15 @@ void tdSetCol(STColumn *pCol, int8_t type, int16_t colId, int32_t bytes) { * NULL for failure */ STSchema *tdNewSchema(int32_t nCols) { - int32_t size = sizeof(STSchema) + sizeof(STColumn) * nCols; + int32_t size = sizeof(STSchema) + sizeof(STColumn) * nCols; STSchema *pSchema = (STSchema *)calloc(1, size); if (pSchema == NULL) return NULL; + pSchema->numOfCols = 0; + pSchema->totalCols = nCols; + pSchema->flen = 0; + pSchema->tlen = 0; return pSchema; } @@ -102,25 +41,34 @@ STSchema *tdNewSchema(int32_t nCols) { /** * Append a column to the schema */ -int tdSchemaAppendCol(STSchema *pSchema, int8_t type, int16_t colId, int32_t bytes) { - // if (pSchema->numOfCols >= pSchema->totalCols) return -1; - if (!isValidDataType(type, 0)) return -1; +int tdSchemaAddCol(STSchema *pSchema, int8_t type, int16_t colId, int32_t bytes) { + if (!isValidDataType(type, 0) || pSchema->numOfCols >= pSchema->totalCols) return -1; STColumn *pCol = schemaColAt(pSchema, schemaNCols(pSchema)); colSetType(pCol, type); colSetColId(pCol, colId); - colSetOffset(pCol, -1); + if (schemaNCols(pSchema) == 0) { + colSetOffset(pCol, 0); + } else { + STColumn *pTCol = schemaColAt(pSchema, schemaNCols(pSchema)-1); + colSetOffset(pCol, pTCol->offset + TYPE_BYTES[pTCol->type]); + } switch (type) { case TSDB_DATA_TYPE_BINARY: case TSDB_DATA_TYPE_NCHAR: - colSetBytes(pCol, bytes); + colSetBytes(pCol, bytes); // Set as maximum bytes + pSchema->tlen += (TYPE_BYTES[type] + sizeof(VarDataLenT) + bytes); break; default: colSetBytes(pCol, TYPE_BYTES[type]); + pSchema->tlen += TYPE_BYTES[type]; break; } pSchema->numOfCols++; + pSchema->flen += TYPE_BYTES[type]; + + ASSERT(pCol->offset < pSchema->flen); return 0; } @@ -138,40 +86,22 @@ STSchema *tdDupSchema(STSchema *pSchema) { return tSchema; } -/** - * Free the SSchema object created by tdNewSchema or tdDupSchema - */ -void tdFreeSchema(STSchema *pSchema) { - if (pSchema != NULL) free(pSchema); -} - -/** - * Function to update each columns's offset field in the schema. - * ASSUMPTIONS: VALID PARAMETERS - */ -void tdUpdateSchema(STSchema *pSchema) { - STColumn *pCol = NULL; - int32_t offset = TD_DATA_ROW_HEAD_SIZE; - for (int i = 0; i < schemaNCols(pSchema); i++) { - pCol = schemaColAt(pSchema, i); - colSetOffset(pCol, offset); - offset += TYPE_BYTES[pCol->type]; - } -} - /** * Return the size of encoded schema */ int tdGetSchemaEncodeSize(STSchema *pSchema) { - return sizeof(STSchema) + schemaNCols(pSchema) * (T_MEMBER_SIZE(STColumn, type) + T_MEMBER_SIZE(STColumn, colId) + - T_MEMBER_SIZE(STColumn, bytes)); + return T_MEMBER_SIZE(STSchema, totalCols) + + schemaNCols(pSchema) * + (T_MEMBER_SIZE(STColumn, type) + T_MEMBER_SIZE(STColumn, colId) + T_MEMBER_SIZE(STColumn, bytes)); } /** * Encode a schema to dst, and return the next pointer */ void *tdEncodeSchema(void *dst, STSchema *pSchema) { - T_APPEND_MEMBER(dst, pSchema, STSchema, numOfCols); + ASSERT(pSchema->numOfCols == pSchema->totalCols); + + T_APPEND_MEMBER(dst, pSchema, STSchema, totalCols); for (int i = 0; i < schemaNCols(pSchema); i++) { STColumn *pCol = schemaColAt(pSchema, i); T_APPEND_MEMBER(dst, pCol, STColumn, type); @@ -186,13 +116,13 @@ void *tdEncodeSchema(void *dst, STSchema *pSchema) { * Decode a schema from a binary. */ STSchema *tdDecodeSchema(void **psrc) { - int numOfCols = 0; + int totalCols = 0; - T_READ_MEMBER(*psrc, int, numOfCols); + T_READ_MEMBER(*psrc, int, totalCols); - STSchema *pSchema = tdNewSchema(numOfCols); + STSchema *pSchema = tdNewSchema(totalCols); if (pSchema == NULL) return NULL; - for (int i = 0; i < numOfCols; i++) { + for (int i = 0; i < totalCols; i++) { int8_t type = 0; int16_t colId = 0; int32_t bytes = 0; @@ -200,7 +130,7 @@ STSchema *tdDecodeSchema(void **psrc) { T_READ_MEMBER(*psrc, int16_t, colId); T_READ_MEMBER(*psrc, int32_t, bytes); - tdSchemaAppendCol(pSchema, type, colId, bytes); + tdSchemaAddCol(pSchema, type, colId, bytes); } return pSchema; @@ -209,53 +139,18 @@ STSchema *tdDecodeSchema(void **psrc) { /** * Initialize a data row */ -void tdInitDataRow(SDataRow row, STSchema *pSchema) { - dataRowSetFLen(row, TD_DATA_ROW_HEAD_SIZE); - dataRowSetLen(row, TD_DATA_ROW_HEAD_SIZE + tdFLenFromSchema(pSchema)); -} +void tdInitDataRow(SDataRow row, STSchema *pSchema) { dataRowSetLen(row, TD_DATA_ROW_HEAD_SIZE + schemaFLen(pSchema)); } -/** - * Create a data row with maximum row length bytes. - * - * NOTE: THE AAPLICATION SHOULD MAKE SURE BYTES IS LARGE ENOUGH TO - * HOLD THE WHOE ROW. - * - * @param bytes max bytes a row can take - * @return SDataRow object for success - * NULL for failure - */ -SDataRow tdNewDataRow(int32_t bytes, STSchema *pSchema) { - int32_t size = sizeof(int32_t) + bytes; +SDataRow tdNewDataRowFromSchema(STSchema *pSchema) { + int32_t size = dataRowMaxBytesFromSchema(pSchema); SDataRow row = malloc(size); if (row == NULL) return NULL; tdInitDataRow(row, pSchema); - return row; } -/** - * Get maximum bytes a data row from a schema - * ASSUMPTIONS: VALID PARAMETER - */ -int tdMaxRowBytesFromSchema(STSchema *pSchema) { - // TODO - int bytes = TD_DATA_ROW_HEAD_SIZE; - for (int i = 0; i < schemaNCols(pSchema); i++) { - STColumn *pCol = schemaColAt(pSchema, i); - bytes += TYPE_BYTES[pCol->type]; - - if (pCol->type == TSDB_DATA_TYPE_BINARY || pCol->type == TSDB_DATA_TYPE_NCHAR) { - bytes += pCol->bytes; - } - } - - return bytes; -} - -SDataRow tdNewDataRowFromSchema(STSchema *pSchema) { return tdNewDataRow(tdMaxRowBytesFromSchema(pSchema), pSchema); } - /** * Free the SDataRow object */ @@ -265,28 +160,49 @@ void tdFreeDataRow(SDataRow row) { /** * Append a column value to the data row + * @param type: column type + * @param bytes: column bytes + * @param offset: offset in the data row tuple, not including the data row header */ -int tdAppendColVal(SDataRow row, void *value, STColumn *pCol) { - switch (colType(pCol)) - { - case TSDB_DATA_TYPE_BINARY: - case TSDB_DATA_TYPE_NCHAR: - *(int32_t *)dataRowAt(row, dataRowFLen(row)) = dataRowLen(row); - dataRowFLen(row) += TYPE_BYTES[colType(pCol)]; - memcpy((void *)dataRowAt(row, dataRowLen(row)), value, strlen(value)); - dataRowLen(row) += strlen(value); - break; - default: - memcpy(dataRowAt(row, dataRowFLen(row)), value, TYPE_BYTES[colType(pCol)]); - dataRowFLen(row) += TYPE_BYTES[colType(pCol)]; - break; +int tdAppendColVal(SDataRow row, void *value, int8_t type, int32_t bytes, int32_t offset) { + ASSERT(value != NULL); + int32_t toffset = offset + TD_DATA_ROW_HEAD_SIZE; + char * ptr = POINTER_DRIFT(row, dataRowLen(row)); + + switch (type) { + case TSDB_DATA_TYPE_BINARY: + case TSDB_DATA_TYPE_NCHAR: + // set offset + *(VarDataOffsetT *)POINTER_DRIFT(row, toffset) = dataRowLen(row); + + // set length + VarDataLenT slen = 0; + if (isNull(value, type)) { + slen = (type == TSDB_DATA_TYPE_BINARY) ? sizeof(int8_t) : sizeof(int32_t); + } else { + if (type == TSDB_DATA_TYPE_BINARY) { + slen = strnlen((char *)value, bytes); + } else { + slen = wcsnlen((wchar_t *)value, (bytes) / TSDB_NCHAR_SIZE) * TSDB_NCHAR_SIZE; + } + } + + ASSERT(slen <= bytes); + *(VarDataLenT *)ptr = slen; + ptr = POINTER_DRIFT(ptr, sizeof(VarDataLenT)); + + memcpy((void *)ptr, value, slen); + dataRowLen(row) += (sizeof(int16_t) + slen); + + break; + default: + memcpy(POINTER_DRIFT(row, toffset), value, TYPE_BYTES[type]); + break; } return 0; } -void tdDataRowReset(SDataRow row, STSchema *pSchema) { tdInitDataRow(row, pSchema); } - SDataRow tdDataRowDup(SDataRow row) { SDataRow trow = malloc(dataRowLen(row)); if (trow == NULL) return NULL; @@ -295,6 +211,119 @@ SDataRow tdDataRowDup(SDataRow row) { return trow; } +void dataColInit(SDataCol *pDataCol, STColumn *pCol, void **pBuf, int maxPoints) { + pDataCol->type = colType(pCol); + pDataCol->colId = colColId(pCol); + pDataCol->bytes = colBytes(pCol); + pDataCol->offset = colOffset(pCol) + TD_DATA_ROW_HEAD_SIZE; + + pDataCol->len = 0; + if (pDataCol->type == TSDB_DATA_TYPE_BINARY || pDataCol->type == TSDB_DATA_TYPE_NCHAR) { + pDataCol->spaceSize = (sizeof(VarDataLenT) + pDataCol->bytes) * maxPoints; + pDataCol->dataOff = (VarDataOffsetT *)(*pBuf); + pDataCol->pData = POINTER_DRIFT(*pBuf, TYPE_BYTES[pDataCol->type] * maxPoints); + *pBuf = POINTER_DRIFT(*pBuf, pDataCol->spaceSize + TYPE_BYTES[pDataCol->type] * maxPoints); + } else { + pDataCol->spaceSize = pDataCol->bytes * maxPoints; + pDataCol->dataOff = NULL; + pDataCol->pData = *pBuf; + *pBuf = POINTER_DRIFT(*pBuf, pDataCol->spaceSize); + } + +} + +void dataColAppendVal(SDataCol *pCol, void *value, int numOfPoints, int maxPoints) { + ASSERT(pCol != NULL && value != NULL); + + switch (pCol->type) { + case TSDB_DATA_TYPE_BINARY: + case TSDB_DATA_TYPE_NCHAR: + // set offset + pCol->dataOff[numOfPoints] = pCol->len; + // Copy data + memcpy(POINTER_DRIFT(pCol->pData, pCol->len), value, varDataTLen(value)); + // Update the length + pCol->len += varDataTLen(value); + break; + default: + ASSERT(pCol->len == TYPE_BYTES[pCol->type] * numOfPoints); + memcpy(POINTER_DRIFT(pCol->pData, pCol->len), value, pCol->bytes); + pCol->len += pCol->bytes; + break; + } +} + +void dataColPopPoints(SDataCol *pCol, int pointsToPop, int numOfPoints) { + int pointsLeft = numOfPoints - pointsToPop; + + ASSERT(pointsLeft > 0); + + if (pCol->type == TSDB_DATA_TYPE_BINARY || pCol->type == TSDB_DATA_TYPE_NCHAR) { + ASSERT(pCol->len > 0); + VarDataOffsetT toffset = pCol->dataOff[pointsToPop]; + pCol->len = pCol->len - toffset; + ASSERT(pCol->len > 0); + memmove(pCol->pData, POINTER_DRIFT(pCol->pData, toffset), pCol->len); + dataColSetOffset(pCol, pointsLeft); + } else { + ASSERT(pCol->len == TYPE_BYTES[pCol->type] * numOfPoints); + pCol->len = TYPE_BYTES[pCol->type] * pointsLeft; + memmove(pCol->pData, POINTER_DRIFT(pCol->pData, TYPE_BYTES[pCol->type] * pointsToPop), pCol->len); + } +} + +bool isNEleNull(SDataCol *pCol, int nEle) { + switch (pCol->type) { + case TSDB_DATA_TYPE_BINARY: + case TSDB_DATA_TYPE_NCHAR: + for (int i = 0; i < nEle; i++) { + if (!isNull(varDataVal(tdGetColDataOfRow(pCol, i)), pCol->type)) return false; + } + return true; + default: + for (int i = 0; i < nEle; i++) { + if (!isNull(tdGetColDataOfRow(pCol, i), pCol->type)) return false; + } + return true; + } +} + +void dataColSetNEleNull(SDataCol *pCol, int nEle, int maxPoints) { + char *ptr = NULL; + switch (pCol->type) { + case TSDB_DATA_TYPE_BINARY: + case TSDB_DATA_TYPE_NCHAR: + pCol->len = 0; + for (int i = 0; i < nEle; i++) { + pCol->dataOff[i] = pCol->len; + ptr = (char *)pCol->pData + pCol->len; + varDataLen(ptr) = (pCol->type == TSDB_DATA_TYPE_BINARY) ? sizeof(char) : TSDB_NCHAR_SIZE; + setNull(ptr + sizeof(VarDataLenT), pCol->type, pCol->bytes); + pCol->len += varDataTLen(ptr); + } + + break; + default: + setNullN(pCol->pData, pCol->type, pCol->bytes, nEle); + pCol->len = TYPE_BYTES[pCol->type] * nEle; + break; + } +} + +void dataColSetOffset(SDataCol *pCol, int nEle) { + ASSERT(((pCol->type == TSDB_DATA_TYPE_BINARY) || (pCol->type == TSDB_DATA_TYPE_NCHAR))); + + void * tptr = pCol->pData; + // char *tptr = (char *)(pCol->pData); + + VarDataOffsetT offset = 0; + for (int i = 0; i < nEle; i++) { + pCol->dataOff[i] = offset; + offset += varDataTLen(tptr); + tptr = POINTER_DRIFT(tptr, varDataTLen(tptr)); + } +} + SDataCols *tdNewDataCols(int maxRowSize, int maxCols, int maxRows) { SDataCols *pCols = (SDataCols *)calloc(1, sizeof(SDataCols) + sizeof(SDataCol) * maxCols); if (pCols == NULL) return NULL; @@ -302,8 +331,9 @@ SDataCols *tdNewDataCols(int maxRowSize, int maxCols, int maxRows) { pCols->maxRowSize = maxRowSize; pCols->maxCols = maxCols; pCols->maxPoints = maxRows; + pCols->bufSize = maxRowSize * maxRows; - pCols->buf = malloc(maxRowSize * maxRows); + pCols->buf = malloc(pCols->bufSize); if (pCols->buf == NULL) { free(pCols); return NULL; @@ -317,24 +347,16 @@ void tdInitDataCols(SDataCols *pCols, STSchema *pSchema) { tdResetDataCols(pCols); pCols->numOfCols = schemaNCols(pSchema); - pCols->cols[0].pData = pCols->buf; - int offset = TD_DATA_ROW_HEAD_SIZE; + void *ptr = pCols->buf; for (int i = 0; i < schemaNCols(pSchema); i++) { - if (i > 0) { - pCols->cols[i].pData = (char *)(pCols->cols[i - 1].pData) + schemaColAt(pSchema, i - 1)->bytes * pCols->maxPoints; - } - pCols->cols[i].type = colType(schemaColAt(pSchema, i)); - pCols->cols[i].bytes = colBytes(schemaColAt(pSchema, i)); - pCols->cols[i].offset = offset; - pCols->cols[i].colId = colColId(schemaColAt(pSchema, i)); - - offset += TYPE_BYTES[pCols->cols[i].type]; + dataColInit(pCols->cols + i, schemaColAt(pSchema, i), &ptr, pCols->maxPoints); + ASSERT((char *)ptr - (char *)(pCols->buf) <= pCols->bufSize); } } void tdFreeDataCols(SDataCols *pCols) { if (pCols) { - if (pCols->buf) free(pCols->buf); + tfree(pCols->buf); free(pCols); } } @@ -351,11 +373,24 @@ SDataCols *tdDupDataCols(SDataCols *pDataCols, bool keepData) { pRet->cols[i].type = pDataCols->cols[i].type; pRet->cols[i].colId = pDataCols->cols[i].colId; pRet->cols[i].bytes = pDataCols->cols[i].bytes; - pRet->cols[i].len = pDataCols->cols[i].len; pRet->cols[i].offset = pDataCols->cols[i].offset; + + pRet->cols[i].spaceSize = pDataCols->cols[i].spaceSize; pRet->cols[i].pData = (void *)((char *)pRet->buf + ((char *)(pDataCols->cols[i].pData) - (char *)(pDataCols->buf))); - if (keepData) memcpy(pRet->cols[i].pData, pDataCols->cols[i].pData, pRet->cols[i].bytes * pDataCols->numOfPoints); + if (pRet->cols[i].type == TSDB_DATA_TYPE_BINARY || pRet->cols[i].type == TSDB_DATA_TYPE_NCHAR) { + ASSERT(pDataCols->cols[i].dataOff != NULL); + pRet->cols[i].dataOff = + (int32_t *)((char *)pRet->buf + ((char *)(pDataCols->cols[i].dataOff) - (char *)(pDataCols->buf))); + } + + if (keepData) { + pRet->cols[i].len = pDataCols->cols[i].len; + memcpy(pRet->cols[i].pData, pDataCols->cols[i].pData, pDataCols->cols[i].len); + if (pRet->cols[i].type == TSDB_DATA_TYPE_BINARY || pRet->cols[i].type == TSDB_DATA_TYPE_NCHAR) { + memcpy(pRet->cols[i].dataOff, pDataCols->cols[i].dataOff, sizeof(VarDataOffsetT) * pDataCols->maxPoints); + } + } } return pRet; @@ -364,57 +399,60 @@ SDataCols *tdDupDataCols(SDataCols *pDataCols, bool keepData) { void tdResetDataCols(SDataCols *pCols) { pCols->numOfPoints = 0; for (int i = 0; i < pCols->maxCols; i++) { - pCols->cols[i].len = 0; + dataColReset(pCols->cols + i); } } void tdAppendDataRowToDataCol(SDataRow row, SDataCols *pCols) { + ASSERT(dataColsKeyLast(pCols) < dataRowKey(row)); + for (int i = 0; i < pCols->numOfCols; i++) { SDataCol *pCol = pCols->cols + i; - memcpy((void *)((char *)(pCol->pData) + pCol->len), dataRowAt(row, pCol->offset), pCol->bytes); - pCol->len += pCol->bytes; + void * value = tdGetRowDataOfCol(row, pCol->type, pCol->offset); + + dataColAppendVal(pCol, value, pCols->numOfPoints, pCols->maxPoints); } pCols->numOfPoints++; } + // Pop pointsToPop points from the SDataCols void tdPopDataColsPoints(SDataCols *pCols, int pointsToPop) { int pointsLeft = pCols->numOfPoints - pointsToPop; + if (pointsLeft <= 0) { + tdResetDataCols(pCols); + return; + } for (int iCol = 0; iCol < pCols->numOfCols; iCol++) { - SDataCol *p_col = pCols->cols + iCol; - if (p_col->len > 0) { - p_col->len = TYPE_BYTES[p_col->type] * pointsLeft; - if (pointsLeft > 0) { - memmove((void *)(p_col->pData), (void *)((char *)(p_col->pData) + TYPE_BYTES[p_col->type] * pointsToPop), p_col->len); - } - } + SDataCol *pCol = pCols->cols + iCol; + dataColPopPoints(pCol, pointsToPop, pCols->numOfPoints); } pCols->numOfPoints = pointsLeft; } -/** - * Return the first part length of a data row for a schema - */ -static int tdFLenFromSchema(STSchema *pSchema) { - int ret = 0; - for (int i = 0; i < schemaNCols(pSchema); i++) { - STColumn *pCol = schemaColAt(pSchema, i); - ret += TYPE_BYTES[pCol->type]; - } - - return ret; -} - int tdMergeDataCols(SDataCols *target, SDataCols *source, int rowsToMerge) { ASSERT(rowsToMerge > 0 && rowsToMerge <= source->numOfPoints); + ASSERT(target->numOfPoints + rowsToMerge <= target->maxPoints); + ASSERT(target->numOfCols == source->numOfCols); - SDataCols *pTarget = tdDupDataCols(target, true); - if (pTarget == NULL) goto _err; - // tdResetDataCols(target); + SDataCols *pTarget = NULL; - int iter1 = 0; - int iter2 = 0; - tdMergeTwoDataCols(target,pTarget, &iter1, source, &iter2, pTarget->numOfPoints + rowsToMerge); + if (dataColsKeyLast(target) < dataColsKeyFirst(source)) { // No overlap + for (int i = 0; i < rowsToMerge; i++) { + for (int j = 0; j < source->numOfCols; j++) { + dataColAppendVal(target->cols + j, tdGetColDataOfRow(source->cols + j, i), target->numOfPoints, + target->maxPoints); + } + } + target->numOfPoints++; + } else { + pTarget = tdDupDataCols(target, true); + if (pTarget == NULL) goto _err; + + int iter1 = 0; + int iter2 = 0; + tdMergeTwoDataCols(target, pTarget, &iter1, source, &iter2, pTarget->numOfPoints + rowsToMerge); + } tdFreeDataCols(pTarget); return 0; @@ -425,6 +463,7 @@ _err: } void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, SDataCols *src2, int *iter2, int tRows) { + // TODO: add resolve duplicate key here tdResetDataCols(target); while (target->numOfPoints < tRows) { @@ -436,10 +475,8 @@ void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, SDataCol if (key1 < key2) { for (int i = 0; i < src1->numOfCols; i++) { ASSERT(target->cols[i].type == src1->cols[i].type); - memcpy((void *)((char *)(target->cols[i].pData) + TYPE_BYTES[target->cols[i].type] * target->numOfPoints), - (void *)((char *)(src1->cols[i].pData) + TYPE_BYTES[target->cols[i].type] * (*iter1)), - TYPE_BYTES[target->cols[i].type]); - target->cols[i].len += TYPE_BYTES[target->cols[i].type]; + dataColAppendVal(target->cols[i].pData, tdGetColDataOfRow(src1->cols + i, *iter1), target->numOfPoints, + target->maxPoints); } target->numOfPoints++; @@ -447,15 +484,14 @@ void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, SDataCol } else if (key1 > key2) { for (int i = 0; i < src2->numOfCols; i++) { ASSERT(target->cols[i].type == src2->cols[i].type); - memcpy((void *)((char *)(target->cols[i].pData) + TYPE_BYTES[target->cols[i].type] * target->numOfPoints), - (void *)((char *)(src2->cols[i].pData) + TYPE_BYTES[src2->cols[i].type] * (*iter2)), - TYPE_BYTES[target->cols[i].type]); - target->cols[i].len += TYPE_BYTES[target->cols[i].type]; + dataColAppendVal(target->cols[i].pData, tdGetColDataOfRow(src2->cols + i, *iter2), target->numOfPoints, + target->maxPoints); } target->numOfPoints++; (*iter2)++; } else { + // TODO: deal with duplicate keys ASSERT(false); } } diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c index 9124295fa0..eb81070f6d 100644 --- a/src/common/src/tglobal.c +++ b/src/common/src/tglobal.c @@ -25,14 +25,15 @@ #include "tutil.h" #include "tlocale.h" #include "ttimezone.h" +#include "tsync.h" char configDir[TSDB_FILENAME_LEN] = "/etc/taos"; char tsVnodeDir[TSDB_FILENAME_LEN] = {0}; char tsDnodeDir[TSDB_FILENAME_LEN] = {0}; char tsMnodeDir[TSDB_FILENAME_LEN] = {0}; -char dataDir[TSDB_FILENAME_LEN] = "/var/lib/taos"; -char scriptDir[TSDB_FILENAME_LEN] = "/etc/taos"; -char osName[10] = "Linux"; +char tsDataDir[TSDB_FILENAME_LEN] = "/var/lib/taos"; +char tsScriptDir[TSDB_FILENAME_LEN] = "/etc/taos"; +char tsOsName[10] = "Linux"; // system info, not configurable int64_t tsPageSize; @@ -60,8 +61,11 @@ int32_t tscEmbedded = 0; */ int64_t tsMsPerDay[] = {86400000L, 86400000000L}; -char tsMasterIp[TSDB_IPv4ADDR_LEN] = {0}; -char tsSecondIp[TSDB_IPv4ADDR_LEN] = {0}; +char tsFirst[TSDB_FQDN_LEN] = {0}; +char tsSecond[TSDB_FQDN_LEN] = {0}; +char tsArbitrator[TSDB_FQDN_LEN] = {0}; +char tsLocalEp[TSDB_FQDN_LEN] = {0}; // Local End Point, hostname:port +uint16_t tsServerPort = 6030; uint16_t tsMnodeShellPort = 6030; // udp[6030-6034] tcp[6030] uint16_t tsDnodeShellPort = 6035; // udp[6035-6039] tcp[6035] uint16_t tsMnodeDnodePort = 6040; // udp/tcp @@ -70,8 +74,6 @@ uint16_t tsSyncPort = 6050; int32_t tsStatusInterval = 1; // second int32_t tsShellActivityTimer = 3; // second -int32_t tsVnodePeerHBTimer = 1; // second -int32_t tsMgmtPeerHBTimer = 1; // second int32_t tsMeterMetaKeepTimer = 7200; // second int32_t tsMetricMetaKeepTimer = 600; // second int32_t tsRpcTimer = 300; @@ -79,8 +81,6 @@ int32_t tsRpcMaxTime = 600; // seconds; float tsNumOfThreadsPerCore = 1.0; float tsRatioOfQueryThreads = 0.5; -char tsPublicIp[TSDB_IPv4ADDR_LEN] = {0}; -char tsPrivateIp[TSDB_IPv4ADDR_LEN] = {0}; int16_t tsNumOfVnodesPerCore = 8; int16_t tsNumOfTotalVnodes = TSDB_INVALID_VNODE_NUM; @@ -112,7 +112,6 @@ int32_t tsNumOfMPeers = 3; int32_t tsMaxShellConns = 2000; int32_t tsMaxTables = 100000; -char tsLocalIp[TSDB_IPv4ADDR_LEN] = {0}; char tsDefaultDB[TSDB_DB_NAME_LEN] = {0}; char tsDefaultUser[64] = "root"; char tsDefaultPass[64] = "taosdata"; @@ -144,6 +143,7 @@ int32_t qdebugFlag = 131; int32_t rpcDebugFlag = 131; int32_t uDebugFlag = 131; int32_t debugFlag = 131; +int32_t sDebugFlag = 131; // the maximum number of results for projection query on super table that are returned from // one virtual node, to order according to timestamp @@ -183,7 +183,6 @@ float tsStreamComputDelayRatio = 0.1; int32_t tsProjectExecInterval = 10000; // every 10sec, the projection will be executed once int64_t tsMaxRetentWindow = 24 * 3600L; // maximum time window tolerance -char tsHttpIp[TSDB_IPv4ADDR_LEN] = "0.0.0.0"; uint16_t tsHttpPort = 6020; // only tcp, range tcp[6020] // uint16_t tsNginxPort = 6060; //only tcp, range tcp[6060] int32_t tsHttpCacheSessions = 100; @@ -194,7 +193,6 @@ int32_t tsHttpEnableRecordSql = 0; int32_t tsTelegrafUseFieldNum = 0; int32_t tsTscEnableRecordSql = 0; -int32_t tsAnyIp = 1; uint32_t tsPublicIpInt = 0; char tsMonitorDbName[TSDB_DB_NAME_LEN] = "log"; @@ -274,69 +272,29 @@ static void doInitGlobalConfig() { SGlobalCfg cfg = {0}; // ip address - cfg.option = "masterIp"; - cfg.ptr = tsMasterIp; - cfg.valType = TAOS_CFG_VTYPE_IPSTR; + cfg.option = "first"; + cfg.ptr = tsFirst; + cfg.valType = TAOS_CFG_VTYPE_STRING; cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT; cfg.minValue = 0; cfg.maxValue = 0; - cfg.ptrLength = TSDB_IPv4ADDR_LEN; + cfg.ptrLength = TSDB_FQDN_LEN; cfg.unitType = TAOS_CFG_UTYPE_NONE; taosInitConfigOption(cfg); - cfg.option = "secondIp"; - cfg.ptr = tsSecondIp; - cfg.valType = TAOS_CFG_VTYPE_IPSTR; + cfg.option = "second"; + cfg.ptr = tsSecond; + cfg.valType = TAOS_CFG_VTYPE_STRING; cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT; cfg.minValue = 0; cfg.maxValue = 0; - cfg.ptrLength = TSDB_IPv4ADDR_LEN; - cfg.unitType = TAOS_CFG_UTYPE_NONE; - taosInitConfigOption(cfg); - - cfg.option = "publicIp"; - cfg.ptr = tsPublicIp; - cfg.valType = TAOS_CFG_VTYPE_IPSTR; - cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG; - cfg.minValue = 0; - cfg.maxValue = 0; - cfg.ptrLength = TSDB_IPv4ADDR_LEN; - cfg.unitType = TAOS_CFG_UTYPE_NONE; - taosInitConfigOption(cfg); - - cfg.option = "privateIp"; - cfg.ptr = tsPrivateIp; - cfg.valType = TAOS_CFG_VTYPE_IPSTR; - cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG; - cfg.minValue = 0; - cfg.maxValue = 0; - cfg.ptrLength = TSDB_IPv4ADDR_LEN; - cfg.unitType = TAOS_CFG_UTYPE_NONE; - taosInitConfigOption(cfg); - - cfg.option = "localIp"; - cfg.ptr = tsLocalIp; - cfg.valType = TAOS_CFG_VTYPE_IPSTR; - cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT; - cfg.minValue = 0; - cfg.maxValue = 0; - cfg.ptrLength = TSDB_IPv4ADDR_LEN; - cfg.unitType = TAOS_CFG_UTYPE_NONE; - taosInitConfigOption(cfg); - - cfg.option = "httpIp"; - cfg.ptr = tsHttpIp; - cfg.valType = TAOS_CFG_VTYPE_IPSTR; - cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG; - cfg.minValue = 0; - cfg.maxValue = 0; - cfg.ptrLength = TSDB_IPv4ADDR_LEN; + cfg.ptrLength = TSDB_FQDN_LEN; cfg.unitType = TAOS_CFG_UTYPE_NONE; taosInitConfigOption(cfg); // port - cfg.option = "mnodeShellPort"; - cfg.ptr = &tsMnodeShellPort; + cfg.option = "serverPort"; + cfg.ptr = &tsServerPort; cfg.valType = TAOS_CFG_VTYPE_INT16; cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT; cfg.minValue = 1; @@ -345,56 +303,6 @@ static void doInitGlobalConfig() { cfg.unitType = TAOS_CFG_UTYPE_NONE; taosInitConfigOption(cfg); - cfg.option = "dnodeShellPort"; - cfg.ptr = &tsDnodeShellPort; - cfg.valType = TAOS_CFG_VTYPE_INT16; - cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT; - cfg.minValue = 1; - cfg.maxValue = 65535; - cfg.ptrLength = 0; - cfg.unitType = TAOS_CFG_UTYPE_NONE; - taosInitConfigOption(cfg); - - cfg.option = "mnodeDnodePort"; - cfg.ptr = &tsMnodeDnodePort; - cfg.valType = TAOS_CFG_VTYPE_INT16; - cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW; - cfg.minValue = 1; - cfg.maxValue = 65535; - cfg.ptrLength = 0; - cfg.unitType = TAOS_CFG_UTYPE_NONE; - taosInitConfigOption(cfg); - - cfg.option = "dnodeMnodePort"; - cfg.ptr = &tsDnodeMnodePort; - cfg.valType = TAOS_CFG_VTYPE_INT16; - cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW; - cfg.minValue = 1; - cfg.maxValue = 65535; - cfg.ptrLength = 0; - cfg.unitType = TAOS_CFG_UTYPE_NONE; - taosInitConfigOption(cfg); - - // cfg.option = "syncPort"; - // cfg.ptr = &syncPort; - // cfg.valType = TAOS_CFG_VTYPE_INT16; - // cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW; - // cfg.minValue = 1; - // cfg.maxValue = 65535; - // cfg.ptrLength = 0; - // cfg.unitType = TAOS_CFG_UTYPE_NONE; - // taosInitConfigOption(cfg); - - cfg.option = "httpPort"; - cfg.ptr = &tsHttpPort; - cfg.valType = TAOS_CFG_VTYPE_INT16; - cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW; - cfg.minValue = 1; - cfg.maxValue = 65535; - cfg.ptrLength = 0; - cfg.unitType = TAOS_CFG_UTYPE_NONE; - taosInitConfigOption(cfg); - // directory cfg.option = "configDir"; cfg.ptr = configDir; @@ -407,7 +315,7 @@ static void doInitGlobalConfig() { taosInitConfigOption(cfg); cfg.option = "logDir"; - cfg.ptr = logDir; + cfg.ptr = tsLogDir; cfg.valType = TAOS_CFG_VTYPE_DIRECTORY; cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT | TSDB_CFG_CTYPE_B_LOG; cfg.minValue = 0; @@ -417,7 +325,7 @@ static void doInitGlobalConfig() { taosInitConfigOption(cfg); cfg.option = "scriptDir"; - cfg.ptr = scriptDir; + cfg.ptr = tsScriptDir; cfg.valType = TAOS_CFG_VTYPE_DIRECTORY; cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT; cfg.minValue = 0; @@ -427,7 +335,7 @@ static void doInitGlobalConfig() { taosInitConfigOption(cfg); cfg.option = "dataDir"; - cfg.ptr = dataDir; + cfg.ptr = tsDataDir; cfg.valType = TAOS_CFG_VTYPE_DIRECTORY; cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG; cfg.minValue = 0; @@ -436,6 +344,16 @@ static void doInitGlobalConfig() { cfg.unitType = TAOS_CFG_UTYPE_NONE; taosInitConfigOption(cfg); + cfg.option = "arbitrator"; + cfg.ptr = tsArbitrator; + cfg.valType = TAOS_CFG_VTYPE_STRING; + cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT; + cfg.minValue = 0; + cfg.maxValue = 0; + cfg.ptrLength = TSDB_FQDN_LEN; + cfg.unitType = TAOS_CFG_UTYPE_NONE; + taosInitConfigOption(cfg); + // dnode configs cfg.option = "numOfThreadsPerCore"; cfg.ptr = &tsNumOfThreadsPerCore; @@ -1107,6 +1025,16 @@ static void doInitGlobalConfig() { cfg.unitType = TAOS_CFG_UTYPE_NONE; taosInitConfigOption(cfg); + cfg.option = "sDebugFlag"; + cfg.ptr = &sDebugFlag; + cfg.valType = TAOS_CFG_VTYPE_INT32; + cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG; + cfg.minValue = 0; + cfg.maxValue = 255; + cfg.ptrLength = 0; + cfg.unitType = TAOS_CFG_UTYPE_NONE; + taosInitConfigOption(cfg); + cfg.option = "sdbDebugFlag"; cfg.ptr = &sdbDebugFlag; cfg.valType = TAOS_CFG_VTYPE_INT32; @@ -1227,16 +1155,6 @@ static void doInitGlobalConfig() { cfg.unitType = TAOS_CFG_UTYPE_NONE; taosInitConfigOption(cfg); - cfg.option = "anyIp"; - cfg.ptr = &tsAnyIp; - cfg.valType = TAOS_CFG_VTYPE_INT32; - cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG; - cfg.minValue = 0; - cfg.maxValue = 1; - cfg.ptrLength = 0; - cfg.unitType = TAOS_CFG_UTYPE_NONE; - taosInitConfigOption(cfg); - // version info cfg.option = "gitinfo"; cfg.ptr = gitinfo; @@ -1284,25 +1202,16 @@ void taosInitGlobalCfg() { } bool taosCheckGlobalCfg() { - if (tsPrivateIp[0] == 0) { - taosGetPrivateIp(tsPrivateIp); + taosGetFqdn(tsLocalEp); + sprintf(tsLocalEp + strlen(tsLocalEp), ":%d", tsServerPort); + uPrint("localEp is %s", tsLocalEp); + + if (tsFirst[0] == 0) { + strcpy(tsFirst, tsLocalEp); } - if (tsPublicIp[0] == 0) { - strcpy(tsPublicIp, tsPrivateIp); - } - tsPublicIpInt = inet_addr(tsPublicIp); - - if (tsLocalIp[0] == 0) { - strcpy(tsLocalIp, tsPrivateIp); - } - - if (tsMasterIp[0] == 0) { - strcpy(tsMasterIp, tsPrivateIp); - } - - if (tsSecondIp[0] == 0) { - strcpy(tsSecondIp, tsMasterIp); + if (tsSecond[0] == 0) { + strcpy(tsSecond, tsLocalEp); } taosGetSystemInfo(); @@ -1324,15 +1233,6 @@ bool taosCheckGlobalCfg() { tsNumOfTotalVnodes = tsNumOfTotalVnodes < TSDB_MIN_VNODES ? TSDB_MIN_VNODES : tsNumOfTotalVnodes; } - if (strlen(tsPrivateIp) == 0) { - uError("privateIp is null"); - return false; - } - - if (tscEmbedded) { - strcpy(tsLocalIp, tsPrivateIp); - } - // todo refactor tsVersion = 0; for (int i = 0; i < 10; i++) { @@ -1345,5 +1245,26 @@ bool taosCheckGlobalCfg() { tsVersion = 10 * tsVersion; + tsMnodeShellPort = tsServerPort + TSDB_PORT_MNODESHELL; // udp[6030-6034] tcp[6030] + tsDnodeShellPort = tsServerPort + TSDB_PORT_DNODESHELL; // udp[6035-6039] tcp[6035] + tsMnodeDnodePort = tsServerPort + TSDB_PORT_MNODEDNODE; // udp/tcp + tsDnodeMnodePort = tsServerPort + TSDB_PORT_DNODEMNODE; // udp/tcp + tsSyncPort = tsServerPort + TSDB_PORT_SYNC; + return true; } + +int taosGetFqdnPortFromEp(char *ep, char *fqdn, uint16_t *port) { + *port = 0; + strcpy(fqdn, ep); + + char *temp = strchr(fqdn, ':'); + if (temp) { + *temp = 0; + *port = atoi(temp+1); + } + + if (*port == 0) *port = tsServerPort; + + return 0; +} diff --git a/src/common/src/ttypes.c b/src/common/src/ttypes.c index 2f4aa6ab76..d99e916c73 100644 --- a/src/common/src/ttypes.c +++ b/src/common/src/ttypes.c @@ -16,33 +16,34 @@ #include "taosdef.h" #include "ttokendef.h" +#include "tscompression.h" const int32_t TYPE_BYTES[11] = { - -1, // TSDB_DATA_TYPE_NULL - sizeof(int8_t), // TSDB_DATA_TYPE_BOOL - sizeof(int8_t), // TSDB_DATA_TYPE_TINYINT - sizeof(int16_t), // TSDB_DATA_TYPE_SMALLINT - sizeof(int32_t), // TSDB_DATA_TYPE_INT - sizeof(int64_t), // TSDB_DATA_TYPE_BIGINT - sizeof(float), // TSDB_DATA_TYPE_FLOAT - sizeof(double), // TSDB_DATA_TYPE_DOUBLE - sizeof(int32_t), // TSDB_DATA_TYPE_BINARY - sizeof(TSKEY), // TSDB_DATA_TYPE_TIMESTAMP - sizeof(int32_t) // TSDB_DATA_TYPE_NCHAR + -1, // TSDB_DATA_TYPE_NULL + sizeof(int8_t), // TSDB_DATA_TYPE_BOOL + sizeof(int8_t), // TSDB_DATA_TYPE_TINYINT + sizeof(int16_t), // TSDB_DATA_TYPE_SMALLINT + sizeof(int32_t), // TSDB_DATA_TYPE_INT + sizeof(int64_t), // TSDB_DATA_TYPE_BIGINT + sizeof(float), // TSDB_DATA_TYPE_FLOAT + sizeof(double), // TSDB_DATA_TYPE_DOUBLE + sizeof(VarDataOffsetT), // TSDB_DATA_TYPE_BINARY + sizeof(TSKEY), // TSDB_DATA_TYPE_TIMESTAMP + sizeof(VarDataOffsetT) // TSDB_DATA_TYPE_NCHAR }; tDataTypeDescriptor tDataTypeDesc[11] = { - {TSDB_DATA_TYPE_NULL, 6, 1, "NOTYPE"}, - {TSDB_DATA_TYPE_BOOL, 4, CHAR_BYTES, "BOOL"}, - {TSDB_DATA_TYPE_TINYINT, 7, CHAR_BYTES, "TINYINT"}, - {TSDB_DATA_TYPE_SMALLINT, 8, SHORT_BYTES, "SMALLINT"}, - {TSDB_DATA_TYPE_INT, 3, INT_BYTES, "INT"}, - {TSDB_DATA_TYPE_BIGINT, 6, LONG_BYTES, "BIGINT"}, - {TSDB_DATA_TYPE_FLOAT, 5, FLOAT_BYTES, "FLOAT"}, - {TSDB_DATA_TYPE_DOUBLE, 6, DOUBLE_BYTES, "DOUBLE"}, - {TSDB_DATA_TYPE_BINARY, 6, 0, "BINARY"}, - {TSDB_DATA_TYPE_TIMESTAMP, 9, LONG_BYTES, "TIMESTAMP"}, - {TSDB_DATA_TYPE_NCHAR, 5, 8, "NCHAR"}, + {TSDB_DATA_TYPE_NULL, 6, 1, "NOTYPE", NULL, NULL}, + {TSDB_DATA_TYPE_BOOL, 4, CHAR_BYTES, "BOOL", tsCompressBool, tsDecompressBool}, + {TSDB_DATA_TYPE_TINYINT, 7, CHAR_BYTES, "TINYINT", tsCompressTinyint, tsDecompressTinyint}, + {TSDB_DATA_TYPE_SMALLINT, 8, SHORT_BYTES, "SMALLINT", tsCompressSmallint, tsDecompressSmallint}, + {TSDB_DATA_TYPE_INT, 3, INT_BYTES, "INT", tsCompressInt, tsDecompressInt}, + {TSDB_DATA_TYPE_BIGINT, 6, LONG_BYTES, "BIGINT", tsCompressBigint, tsDecompressBigint}, + {TSDB_DATA_TYPE_FLOAT, 5, FLOAT_BYTES, "FLOAT", tsCompressFloat, tsDecompressFloat}, + {TSDB_DATA_TYPE_DOUBLE, 6, DOUBLE_BYTES, "DOUBLE", tsCompressDouble, tsDecompressDouble}, + {TSDB_DATA_TYPE_BINARY, 6, 0, "BINARY", tsCompressString, tsDecompressString}, + {TSDB_DATA_TYPE_TIMESTAMP, 9, LONG_BYTES, "TIMESTAMP", tsCompressTimestamp, tsDecompressTimestamp}, + {TSDB_DATA_TYPE_NCHAR, 5, 8, "NCHAR", tsCompressString, tsDecompressString}, }; char tTokenTypeSwitcher[13] = { diff --git a/src/dnode/src/dnodeMClient.c b/src/dnode/src/dnodeMClient.c index 151d44922d..3aa863799b 100644 --- a/src/dnode/src/dnodeMClient.c +++ b/src/dnode/src/dnodeMClient.c @@ -59,16 +59,13 @@ void dnodeUpdateIpSet(void *ahandle, SRpcIpSet *pIpSet) { tsMnodeIpSet = *pIpSet; } -void dnodeGetMnodeIpSet(void *ipSetRaw, bool usePublicIp) { +void dnodeGetMnodeDnodeIpSet(void *ipSetRaw) { SRpcIpSet *ipSet = ipSetRaw; ipSet->numOfIps = tsMnodeInfos.nodeNum; ipSet->inUse = tsMnodeInfos.inUse; for (int32_t i = 0; i < tsMnodeInfos.nodeNum; ++i) { - if (usePublicIp) { - ipSet->ip[i] = tsMnodeInfos.nodeInfos[i].nodeIp; - } else { - ipSet->ip[i] = tsMnodeInfos.nodeInfos[i].nodeIp; - } + taosGetFqdnPortFromEp(tsMnodeInfos.nodeInfos[i].nodeEp, ipSet->fqdn[i], &ipSet->port[i]); + ipSet->port[i] += TSDB_PORT_MNODEDNODE; } } @@ -85,26 +82,25 @@ int32_t dnodeInitMClient() { if (!dnodeReadMnodeInfos()) { memset(&tsMnodeIpSet, 0, sizeof(SRpcIpSet)); memset(&tsMnodeInfos, 0, sizeof(SDMMnodeInfos)); - tsMnodeIpSet.port = tsMnodeDnodePort; tsMnodeIpSet.numOfIps = 1; - tsMnodeIpSet.ip[0] = inet_addr(tsMasterIp); - if (strcmp(tsSecondIp, tsMasterIp) != 0) { + taosGetFqdnPortFromEp(tsFirst, tsMnodeIpSet.fqdn[0], &tsMnodeIpSet.port[0]); + tsMnodeIpSet.port[0] += TSDB_PORT_MNODEDNODE; + if (strcmp(tsSecond, tsFirst) != 0) { tsMnodeIpSet.numOfIps = 2; - tsMnodeIpSet.ip[1] = inet_addr(tsSecondIp); + taosGetFqdnPortFromEp(tsSecond, tsMnodeIpSet.fqdn[1], &tsMnodeIpSet.port[1]); + tsMnodeIpSet.port[1] += TSDB_PORT_MNODEDNODE; } } else { tsMnodeIpSet.inUse = tsMnodeInfos.inUse; tsMnodeIpSet.numOfIps = tsMnodeInfos.nodeNum; - tsMnodeIpSet.port = tsMnodeInfos.nodeInfos[0].nodePort; for (int32_t i = 0; i < tsMnodeInfos.nodeNum; i++) { - tsMnodeIpSet.ip[i] = tsMnodeInfos.nodeInfos[i].nodeIp; + taosGetFqdnPortFromEp(tsMnodeInfos.nodeInfos[i].nodeEp, tsMnodeIpSet.fqdn[i], &tsMnodeIpSet.port[i]); + tsMnodeIpSet.port[i] += TSDB_PORT_MNODEDNODE; } } SRpcInit rpcInit; memset(&rpcInit, 0, sizeof(rpcInit)); - rpcInit.localIp = tsAnyIp ? "0.0.0.0" : tsPrivateIp; - rpcInit.localPort = 0; rpcInit.label = "DND-MC"; rpcInit.numOfThreads = 1; rpcInit.cfp = dnodeProcessRspFromMnode; @@ -182,9 +178,6 @@ static void dnodeProcessStatusRsp(SRpcMsg *pMsg) { for (int32_t i = 0; i < pMnodes->nodeNum; ++i) { SDMMnodeInfo *pMnodeInfo = &pMnodes->nodeInfos[i]; pMnodeInfo->nodeId = htonl(pMnodeInfo->nodeId); - pMnodeInfo->nodeIp = htonl(pMnodeInfo->nodeIp); - pMnodeInfo->nodePort = htons(pMnodeInfo->nodePort); - pMnodeInfo->syncPort = htons(pMnodeInfo->syncPort); } SDMVgroupAccess *pVgAcccess = pStatusRsp->vgAccess; @@ -207,15 +200,14 @@ static void dnodeUpdateMnodeInfos(SDMMnodeInfos *pMnodes) { tsMnodeIpSet.inUse = tsMnodeInfos.inUse; tsMnodeIpSet.numOfIps = tsMnodeInfos.nodeNum; - tsMnodeIpSet.port = tsMnodeInfos.nodeInfos[0].nodePort; for (int32_t i = 0; i < tsMnodeInfos.nodeNum; i++) { - tsMnodeIpSet.ip[i] = tsMnodeInfos.nodeInfos[i].nodeIp; + taosGetFqdnPortFromEp(tsMnodeInfos.nodeInfos[i].nodeEp, tsMnodeIpSet.fqdn[i], &tsMnodeIpSet.port[i]); + tsMnodeIpSet.port[i] += TSDB_PORT_MNODEDNODE; } dPrint("mnodes is changed, nodeNum:%d inUse:%d", tsMnodeInfos.nodeNum, tsMnodeInfos.inUse); for (int32_t i = 0; i < tsMnodeInfos.nodeNum; i++) { - dPrint("mnode:%d, ip:%s:%u name:%s", tsMnodeInfos.nodeInfos[i].nodeId, taosIpStr(tsMnodeInfos.nodeInfos[i].nodeIp), - tsMnodeInfos.nodeInfos[i].nodePort, tsMnodeInfos.nodeInfos[i].nodeName); + dPrint("mnode:%d, %s", tsMnodeInfos.nodeInfos[i].nodeId, tsMnodeInfos.nodeInfos[i].nodeEp); } dnodeSaveMnodeInfos(); @@ -291,42 +283,19 @@ static bool dnodeReadMnodeInfos() { } tsMnodeInfos.nodeInfos[i].nodeId = nodeId->valueint; - cJSON *nodeIp = cJSON_GetObjectItem(nodeInfo, "nodeIp"); - if (!nodeIp || nodeIp->type != cJSON_String || nodeIp->valuestring == NULL) { - dError("failed to read mnode mgmtIpList.json, nodeIp not found"); - goto PARSE_OVER; - } - tsMnodeInfos.nodeInfos[i].nodeIp = inet_addr(nodeIp->valuestring); - - cJSON *nodePort = cJSON_GetObjectItem(nodeInfo, "nodePort"); - if (!nodePort || nodePort->type != cJSON_Number) { - dError("failed to read mnode mgmtIpList.json, nodePort not found"); - goto PARSE_OVER; - } - tsMnodeInfos.nodeInfos[i].nodePort = (uint16_t)nodePort->valueint; - - cJSON *syncPort = cJSON_GetObjectItem(nodeInfo, "syncPort"); - if (!syncPort || syncPort->type != cJSON_Number) { - dError("failed to read mnode mgmtIpList.json, syncPort not found"); - goto PARSE_OVER; - } - tsMnodeInfos.nodeInfos[i].syncPort = (uint16_t)syncPort->valueint; - - cJSON *nodeName = cJSON_GetObjectItem(nodeInfo, "nodeName"); - if (!nodeName || nodeName->type != cJSON_String || nodeName->valuestring == NULL) { + cJSON *nodeEp = cJSON_GetObjectItem(nodeInfo, "nodeEp"); + if (!nodeEp || nodeEp->type != cJSON_String || nodeEp->valuestring == NULL) { dError("failed to read mnode mgmtIpList.json, nodeName not found"); goto PARSE_OVER; } - strncpy(tsMnodeInfos.nodeInfos[i].nodeName, nodeName->valuestring, TSDB_NODE_NAME_LEN); - } + strncpy(tsMnodeInfos.nodeInfos[i].nodeEp, nodeEp->valuestring, TSDB_FQDN_LEN); + } ret = true; dPrint("read mnode iplist successed, numOfIps:%d inUse:%d", tsMnodeInfos.nodeNum, tsMnodeInfos.inUse); for (int32_t i = 0; i < tsMnodeInfos.nodeNum; i++) { - dPrint("mnode:%d, ip:%s:%u name:%s", tsMnodeInfos.nodeInfos[i].nodeId, - taosIpStr(tsMnodeInfos.nodeInfos[i].nodeIp), tsMnodeInfos.nodeInfos[i].nodePort, - tsMnodeInfos.nodeInfos[i].nodeName); + dPrint("mnode:%d, %s", tsMnodeInfos.nodeInfos[i].nodeId, tsMnodeInfos.nodeInfos[i].nodeEp); } PARSE_OVER: @@ -352,10 +321,7 @@ static void dnodeSaveMnodeInfos() { len += snprintf(content + len, maxLen - len, " \"nodeInfos\": [{\n"); for (int32_t i = 0; i < tsMnodeInfos.nodeNum; i++) { len += snprintf(content + len, maxLen - len, " \"nodeId\": %d,\n", tsMnodeInfos.nodeInfos[i].nodeId); - len += snprintf(content + len, maxLen - len, " \"nodeIp\": \"%s\",\n", taosIpStr(tsMnodeInfos.nodeInfos[i].nodeIp)); - len += snprintf(content + len, maxLen - len, " \"nodePort\": %u,\n", tsMnodeInfos.nodeInfos[i].nodePort); - len += snprintf(content + len, maxLen - len, " \"syncPort\": %u,\n", tsMnodeInfos.nodeInfos[i].syncPort); - len += snprintf(content + len, maxLen - len, " \"nodeName\": \"%s\"\n", tsMnodeInfos.nodeInfos[i].nodeName); + len += snprintf(content + len, maxLen - len, " \"nodeEp\": \"%s\"\n", tsMnodeInfos.nodeInfos[i].nodeEp); if (i < tsMnodeInfos.nodeNum -1) { len += snprintf(content + len, maxLen - len, " },{\n"); } else { @@ -371,8 +337,8 @@ static void dnodeSaveMnodeInfos() { dPrint("save mnode iplist successed"); } -uint32_t dnodeGetMnodeMasteIp() { - return tsMnodeIpSet.ip[tsMnodeIpSet.inUse]; +char *dnodeGetMnodeMasterEp() { + return tsMnodeInfos.nodeInfos[tsMnodeIpSet.inUse].nodeEp; } void* dnodeGetMnodeInfos() { @@ -402,8 +368,7 @@ static void dnodeSendStatusMsg(void *handle, void *tmrId) { //strcpy(pStatus->dnodeName, tsDnodeName); pStatus->version = htonl(tsVersion); pStatus->dnodeId = htonl(tsDnodeCfg.dnodeId); - pStatus->privateIp = htonl(inet_addr(tsPrivateIp)); - pStatus->publicIp = htonl(inet_addr(tsPublicIp)); + strcpy(pStatus->dnodeEp, tsLocalEp); pStatus->lastReboot = htonl(tsRebootTime); pStatus->numOfTotalVnodes = htons((uint16_t) tsNumOfTotalVnodes); pStatus->numOfCores = htons((uint16_t) tsNumOfCores); @@ -500,4 +465,4 @@ void dnodeUpdateDnodeCfg(SDMDnodeCfg *pCfg) { int32_t dnodeGetDnodeId() { return tsDnodeCfg.dnodeId; -} \ No newline at end of file +} diff --git a/src/dnode/src/dnodeMain.c b/src/dnode/src/dnodeMain.c index b8ac9d1d4a..6aa42f05c7 100644 --- a/src/dnode/src/dnodeMain.c +++ b/src/dnode/src/dnodeMain.c @@ -15,6 +15,7 @@ #define _DEFAULT_SOURCE #include "os.h" +#include "taos.h" #include "tglobal.h" #include "trpc.h" #include "tutil.h" @@ -144,12 +145,12 @@ static int32_t dnodeInitSystem() { signal(SIGPIPE, SIG_IGN); struct stat dirstat; - if (stat(logDir, &dirstat) < 0) { - mkdir(logDir, 0755); + if (stat(tsLogDir, &dirstat) < 0) { + mkdir(tsLogDir, 0755); } char temp[TSDB_FILENAME_LEN]; - sprintf(temp, "%s/taosdlog", logDir); + sprintf(temp, "%s/taosdlog", tsLogDir); if (taosInitLog(temp, tsNumOfLogLines, 1) < 0) { printf("failed to init log file\n"); } @@ -161,8 +162,7 @@ static int32_t dnodeInitSystem() { } taosPrintGlobalCfg(); - dPrint("Server IP address is:%s", tsPrivateIp); - dPrint("starting to initialize TDengine ..."); + dPrint("start to initialize TDengine on %s", tsLocalEp); if (dnodeInitStorage() != 0) return -1; if (dnodeInitRead() != 0) return -1; @@ -191,6 +191,7 @@ static void dnodeCleanUpSystem() { dnodeCleanupWrite(); dnodeCleanupRead(); dnodeCleanUpModules(); + taos_cleanup(); dnodeCleanupStorage(); taosCloseLog(); } @@ -218,13 +219,13 @@ static void dnodeCheckDataDirOpenned(char *dir) { static int32_t dnodeInitStorage() { struct stat dirstat; - if (stat(dataDir, &dirstat) < 0) { - mkdir(dataDir, 0755); + if (stat(tsDataDir, &dirstat) < 0) { + mkdir(tsDataDir, 0755); } - sprintf(tsMnodeDir, "%s/mnode", dataDir); - sprintf(tsVnodeDir, "%s/vnode", dataDir); - sprintf(tsDnodeDir, "%s/dnode", dataDir); + sprintf(tsMnodeDir, "%s/mnode", tsDataDir); + sprintf(tsVnodeDir, "%s/vnode", tsDataDir); + sprintf(tsDnodeDir, "%s/dnode", tsDataDir); mkdir(tsVnodeDir, 0755); mkdir(tsDnodeDir, 0755); @@ -237,5 +238,5 @@ static int32_t dnodeInitStorage() { static void dnodeCleanupStorage() {} bool dnodeIsFirstDeploy() { - return strcmp(tsMasterIp, tsPrivateIp) == 0; -} \ No newline at end of file + return strcmp(tsFirst, tsLocalEp) == 0; +} diff --git a/src/dnode/src/dnodeMgmt.c b/src/dnode/src/dnodeMgmt.c index fef91c5786..2fa7762c44 100644 --- a/src/dnode/src/dnodeMgmt.c +++ b/src/dnode/src/dnodeMgmt.c @@ -139,11 +139,9 @@ static int32_t dnodeProcessCreateVnodeMsg(SRpcMsg *rpcMsg) { pCreate->cfg.minRowsPerFileBlock = htonl(pCreate->cfg.minRowsPerFileBlock); pCreate->cfg.maxRowsPerFileBlock = htonl(pCreate->cfg.maxRowsPerFileBlock); pCreate->cfg.commitTime = htonl(pCreate->cfg.commitTime); - pCreate->cfg.arbitratorIp = htonl(pCreate->cfg.arbitratorIp); for (int32_t j = 0; j < pCreate->cfg.replications; ++j) { pCreate->nodes[j].nodeId = htonl(pCreate->nodes[j].nodeId); - pCreate->nodes[j].nodeIp = htonl(pCreate->nodes[j].nodeIp); } void *pVnode = vnodeAccquireVnode(pCreate->cfg.vgId); diff --git a/src/dnode/src/dnodeMnode.c b/src/dnode/src/dnodeMnode.c index ac477c4de1..75c09d43ba 100644 --- a/src/dnode/src/dnodeMnode.c +++ b/src/dnode/src/dnodeMnode.c @@ -38,7 +38,6 @@ int32_t dnodeInitMnode() { SRpcInit rpcInit; memset(&rpcInit, 0, sizeof(rpcInit)); - rpcInit.localIp = tsAnyIp ? "0.0.0.0" : tsPrivateIp; rpcInit.localPort = tsDnodeMnodePort; rpcInit.label = "DND-MS"; rpcInit.numOfThreads = 1; diff --git a/src/dnode/src/dnodeShell.c b/src/dnode/src/dnodeShell.c index 8a846b8a50..544d443bc0 100644 --- a/src/dnode/src/dnodeShell.c +++ b/src/dnode/src/dnodeShell.c @@ -47,7 +47,6 @@ int32_t dnodeInitShell() { SRpcInit rpcInit; memset(&rpcInit, 0, sizeof(rpcInit)); - rpcInit.localIp = tsAnyIp ? "0.0.0.0" : tsPrivateIp; rpcInit.localPort = tsDnodeShellPort; rpcInit.label = "DND-shell"; rpcInit.numOfThreads = numOfThreads; diff --git a/src/inc/dnode.h b/src/inc/dnode.h index 6fbfa7ffa9..c4b893ab86 100644 --- a/src/inc/dnode.h +++ b/src/inc/dnode.h @@ -42,8 +42,8 @@ void dnodeFreeRqueue(void *rqueue); void dnodeSendRpcWriteRsp(void *pVnode, void *param, int32_t code); bool dnodeIsFirstDeploy(); -uint32_t dnodeGetMnodeMasteIp(); -void dnodeGetMnodeIpSet(void *ipSet, bool usePublicIp); +char *dnodeGetMnodeMasterEp(); +void dnodeGetMnodeDnodeIpSet(void *ipSet); void * dnodeGetMnodeInfos(); int32_t dnodeGetDnodeId(); diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h index 1a3316cdcf..ce0d52d737 100644 --- a/src/inc/taosdef.h +++ b/src/inc/taosdef.h @@ -32,6 +32,13 @@ extern "C" { #define TSKEY int64_t #endif +// ----------------- For variable data types such as TSDB_DATA_TYPE_BINARY and TSDB_DATA_TYPE_NCHAR +typedef int32_t VarDataOffsetT; +typedef int16_t VarDataLenT; +#define varDataLen(v) ((VarDataLenT *)(v))[0] +#define varDataTLen(v) (sizeof(VarDataLenT) + varDataLen(v)) +#define varDataVal(v) ((void *)((char *)v + sizeof(VarDataLenT))) + // this data type is internally used only in 'in' query to hold the values #define TSDB_DATA_TYPE_ARRAY (TSDB_DATA_TYPE_NCHAR + 1) @@ -121,6 +128,10 @@ typedef struct tDataTypeDescriptor { int16_t nameLen; int32_t nSize; char * aName; + int (*compFunc)(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, + char algorithm, char *const buffer, int bufferSize); + int (*decompFunc)(const char *const input, int compressedSize, const int nelements, char *const output, + int outputSize, char algorithm, char *const buffer, int bufferSize); } tDataTypeDescriptor; extern tDataTypeDescriptor tDataTypeDesc[11]; @@ -187,11 +198,10 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size); #define TSDB_CITY_LEN 20 #define TSDB_STATE_LEN 20 #define TSDB_COUNTRY_LEN 20 -#define TSDB_VNODES_SUPPORT 6 -#define TSDB_MGMT_SUPPORT 4 #define TSDB_LOCALE_LEN 64 #define TSDB_TIMEZONE_LEN 64 +#define TSDB_FQDN_LEN 72 #define TSDB_IPv4ADDR_LEN 16 #define TSDB_FILENAME_LEN 128 #define TSDB_METER_VNODE_BITS 20 @@ -218,8 +228,7 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size); #define TSDB_DNODE_ROLE_MGMT 1 #define TSDB_DNODE_ROLE_VNODE 2 -#define TSDB_MAX_MPEERS 5 -#define TSDB_MAX_MGMT_IPS (TSDB_MAX_MPEERS+1) +#define TSDB_MAX_REPLICA 5 #define TSDB_TBNAME_COLUMN_INDEX (-1) #define TSDB_MULTI_METERMETA_MAX_NUM 100000 // maximum batch size allowed to load metermeta @@ -320,6 +329,12 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size); #define TSDB_MAX_NORMAL_TABLES 1000 #define TSDB_MAX_CHILD_TABLES 100000 +#define TSDB_PORT_MNODESHELL 0 +#define TSDB_PORT_DNODESHELL 5 +#define TSDB_PORT_DNODEMNODE 10 +#define TSDB_PORT_MNODEDNODE 15 +#define TSDB_PORT_SYNC 20 + typedef enum { TSDB_PRECISION_MILLI, TSDB_PRECISION_MICRO, diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h index f0a6b55638..fd3105e3bb 100644 --- a/src/inc/taosmsg.h +++ b/src/inc/taosmsg.h @@ -187,7 +187,7 @@ extern char *taosMsg[]; #pragma pack(push, 1) typedef struct { - uint32_t ip; + char fqdn[TSDB_FQDN_LEN]; uint16_t port; } SIpAddr; @@ -265,6 +265,7 @@ typedef struct { char tableId[TSDB_TABLE_ID_LEN + 1]; char db[TSDB_DB_NAME_LEN + 1]; int8_t igExists; + int8_t getMeta; int16_t numOfTags; int16_t numOfColumns; int16_t sqlLen; // the length of SQL, it starts after schema , sql is a null-terminated string @@ -549,24 +550,19 @@ typedef struct { typedef struct { int32_t nodeId; - uint32_t nodeIp; - uint16_t nodePort; - uint16_t syncPort; - char nodeName[TSDB_NODE_NAME_LEN + 1]; + char nodeEp[TSDB_FQDN_LEN]; } SDMMnodeInfo; typedef struct { int8_t inUse; int8_t nodeNum; - SDMMnodeInfo nodeInfos[TSDB_MAX_MPEERS]; + SDMMnodeInfo nodeInfos[TSDB_MAX_REPLICA]; } SDMMnodeInfos; typedef struct { uint32_t version; int32_t dnodeId; - char dnodeName[TSDB_NODE_NAME_LEN + 1]; - uint32_t privateIp; - uint32_t publicIp; + char dnodeEp[TSDB_FQDN_LEN]; uint32_t moduleStatus; uint32_t lastReboot; // time stamp for last reboot uint16_t numOfTotalVnodes; // from config file @@ -603,19 +599,17 @@ typedef struct { int8_t replications; int8_t wals; int8_t quorum; - uint32_t arbitratorIp; int8_t reserved[16]; } SMDVnodeCfg; typedef struct { int32_t nodeId; - uint32_t nodeIp; - char nodeName[TSDB_NODE_NAME_LEN + 1]; + char nodeEp[TSDB_FQDN_LEN]; } SMDVnodeDesc; typedef struct { SMDVnodeCfg cfg; - SMDVnodeDesc nodes[TSDB_MAX_MPEERS]; + SMDVnodeDesc nodes[TSDB_MAX_REPLICA]; } SMDCreateVnodeMsg; typedef struct { @@ -738,7 +732,7 @@ typedef struct SCMShowRsp { } SCMShowRsp; typedef struct { - char ip[32]; + char ep[TSDB_FQDN_LEN]; // end point, hostname:port } SCMCreateDnodeMsg, SCMDropDnodeMsg; typedef struct { @@ -753,7 +747,7 @@ typedef struct { } SDMConfigVnodeMsg; typedef struct { - char ip[32]; + char ep[TSDB_FQDN_LEN]; // end point, hostname:port char config[64]; } SMDCfgDnodeMsg, SCMCfgDnodeMsg; diff --git a/src/inc/trpc.h b/src/inc/trpc.h index 5845823b38..8b082b65b8 100644 --- a/src/inc/trpc.h +++ b/src/inc/trpc.h @@ -31,8 +31,8 @@ extern int tsRpcHeadSize; typedef struct { int8_t inUse; int8_t numOfIps; - uint16_t port; - uint32_t ip[TSDB_MAX_MPEERS]; + uint16_t port[TSDB_MAX_REPLICA]; + char fqdn[TSDB_MAX_REPLICA][TSDB_FQDN_LEN]; } SRpcIpSet; typedef struct { @@ -51,7 +51,6 @@ typedef struct { } SRpcMsg; typedef struct { - char *localIp; // local IP used uint16_t localPort; // local port char *label; // for debug purpose int numOfThreads; // number of threads to handle connections diff --git a/src/inc/tsdb.h b/src/inc/tsdb.h index 38ded5cf10..a59a278d52 100644 --- a/src/inc/tsdb.h +++ b/src/inc/tsdb.h @@ -104,9 +104,10 @@ void tsdbClearTableCfg(STableCfg *config); int32_t tsdbGetTableTagVal(TsdbRepoT *repo, STableId id, int32_t col, int16_t *type, int16_t *bytes, char **val); int32_t tsdbTableGetName(TsdbRepoT *repo, STableId id, char** name); -int tsdbCreateTable(TsdbRepoT *repo, STableCfg *pCfg); -int tsdbDropTable(TsdbRepoT *pRepo, STableId tableId); -int tsdbAlterTable(TsdbRepoT *repo, STableCfg *pCfg); +int tsdbCreateTable(TsdbRepoT *repo, STableCfg *pCfg); +int tsdbDropTable(TsdbRepoT *pRepo, STableId tableId); +int tsdbAlterTable(TsdbRepoT *repo, STableCfg *pCfg); +TSKEY tsdbGetTableLastKey(TsdbRepoT *repo, int64_t uid); // the TSDB repository info typedef struct STsdbRepoInfo { diff --git a/src/inc/tsync.h b/src/inc/tsync.h index c7a05c0a2d..797de063b9 100644 --- a/src/inc/tsync.h +++ b/src/inc/tsync.h @@ -38,12 +38,11 @@ typedef enum _TAOS_SYNC_STATUS { typedef struct { uint32_t nodeId; // node ID assigned by TDengine - uint32_t nodeIp; // node IP address - char name[TSDB_FILENAME_LEN]; // external node name + uint16_t nodePort; // node sync Port + char nodeFqdn[TSDB_FQDN_LEN]; // node FQDN } SNodeInfo; typedef struct { - uint32_t arbitratorIp; // arbitrator IP address int8_t quorum; // number of confirms required, >=1 int8_t replica; // number of replications, >=1 SNodeInfo nodeInfo[TAOS_SYNC_MAX_REPLICA]; @@ -107,6 +106,7 @@ extern int tsMaxWatchFiles; extern int tsSyncTimer; extern int tsMaxFwdInfo; extern int sDebugFlag; +extern char tsArbitrator[]; extern uint16_t tsSyncPort; #ifdef __cplusplus diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c index c85ed47023..eeaeec83f2 100644 --- a/src/kit/shell/src/shellEngine.c +++ b/src/kit/shell/src/shellEngine.c @@ -40,7 +40,7 @@ History history; */ TAOS *shellInit(struct arguments *args) { printf("\n"); - printf(CLIENT_VERSION, osName, taos_get_client_info()); + printf(CLIENT_VERSION, tsOsName, taos_get_client_info()); fflush(stdout); // set options before initializing diff --git a/src/mnode/inc/mgmtDb.h b/src/mnode/inc/mgmtDb.h index 920217b9b8..b00a2bdf3d 100644 --- a/src/mnode/inc/mgmtDb.h +++ b/src/mnode/inc/mgmtDb.h @@ -32,6 +32,7 @@ int32_t mgmtInitDbs(); void mgmtCleanUpDbs(); SDbObj *mgmtGetDb(char *db); SDbObj *mgmtGetDbByTableId(char *db); +void * mgmtGetNextDb(void *pNode, SDbObj **pDb); void mgmtIncDbRef(SDbObj *pDb); void mgmtDecDbRef(SDbObj *pDb); bool mgmtCheckIsMonitorDB(char *db, char *monitordb); diff --git a/src/mnode/inc/mgmtDef.h b/src/mnode/inc/mgmtDef.h index a7e75f9777..34249d3f00 100644 --- a/src/mnode/inc/mgmtDef.h +++ b/src/mnode/inc/mgmtDef.h @@ -31,13 +31,9 @@ struct SMnodeObj; typedef struct SDnodeObj { int32_t dnodeId; - uint32_t privateIp; - uint32_t publicIp; - uint16_t mnodeShellPort; - uint16_t mnodeDnodePort; - uint16_t dnodeShellPort; - uint16_t dnodeMnodePort; - uint16_t syncPort; + uint16_t dnodePort; + char dnodeFqdn[TSDB_FQDN_LEN]; + char dnodeEp[TSDB_FQDN_LEN]; int64_t createdTime; uint32_t lastAccess; int32_t openVnodes; @@ -47,7 +43,6 @@ typedef struct SDnodeObj { int8_t alternativeRole; // from dnode status msg, 0-any, 1-mgmt, 2-dnode int8_t status; // set in balance function int8_t isMgmt; - char dnodeName[TSDB_NODE_NAME_LEN + 1]; int8_t reserved[15]; int8_t updateEnd[1]; int32_t refCount; @@ -123,7 +118,7 @@ typedef struct SVgObj { uint32_t vgId; char dbName[TSDB_DB_NAME_LEN + 1]; int64_t createdTime; - SVnodeGid vnodeGid[TSDB_VNODES_SUPPORT]; + SVnodeGid vnodeGid[TSDB_MAX_REPLICA]; int32_t numOfVnodes; int32_t lbDnodeId; int32_t lbTime; @@ -242,7 +237,6 @@ typedef struct { typedef struct { uint8_t msgType; - int8_t usePublicIp; int8_t received; int8_t successed; int8_t expected; diff --git a/src/mnode/inc/mgmtDnode.h b/src/mnode/inc/mgmtDnode.h index 8acd4e9117..1b5199e727 100644 --- a/src/mnode/inc/mgmtDnode.h +++ b/src/mnode/inc/mgmtDnode.h @@ -38,7 +38,7 @@ void * mgmtGetNextDnode(void *pNode, SDnodeObj **pDnode); void mgmtIncDnodeRef(SDnodeObj *pDnode); void mgmtDecDnodeRef(SDnodeObj *pDnode); void * mgmtGetDnode(int32_t dnodeId); -void * mgmtGetDnodeByIp(uint32_t ip); +void * mgmtGetDnodeByIp(char *ep); void mgmtUpdateDnode(SDnodeObj *pDnode); int32_t mgmtDropDnode(SDnodeObj *pDnode); diff --git a/src/mnode/inc/mgmtMnode.h b/src/mnode/inc/mgmtMnode.h index 4fb57d7151..cb1d009c8c 100644 --- a/src/mnode/inc/mgmtMnode.h +++ b/src/mnode/inc/mgmtMnode.h @@ -33,16 +33,19 @@ void mgmtCleanupMnodes(); int32_t mgmtAddMnode(int32_t dnodeId); int32_t mgmtDropMnode(int32_t dnodeId); +void mgmtDropMnodeLocal(int32_t dnodeId); void * mgmtGetMnode(int32_t mnodeId); int32_t mgmtGetMnodesNum(); void * mgmtGetNextMnode(void *pNode, struct SMnodeObj **pMnode); -void mgmtReleaseMnode(struct SMnodeObj *pMnode); +void mgmtIncMnodeRef(struct SMnodeObj *pMnode); +void mgmtDecMnodeRef(struct SMnodeObj *pMnode); char * mgmtGetMnodeRoleStr(); -void mgmtGetMnodeIpSet(SRpcIpSet *ipSet, bool usePublicIp); +void mgmtGetMnodeIpSet(SRpcIpSet *ipSet); void mgmtGetMnodeInfos(void *mnodes); + #ifdef __cplusplus } #endif diff --git a/src/mnode/inc/mgmtProfile.h b/src/mnode/inc/mgmtProfile.h index 07ed3f0f13..f33ff9c3fa 100644 --- a/src/mnode/inc/mgmtProfile.h +++ b/src/mnode/inc/mgmtProfile.h @@ -24,14 +24,6 @@ extern "C" { int32_t mgmtInitProfile(); void mgmtCleanUpProfile(); -bool mgmtCheckQhandle(uint64_t qhandle); -void mgmtSaveQhandle(void *qhandle); -void mgmtFreeQhandle(void *qhandle); - -void * mgmtMallocQueuedMsg(SRpcMsg *rpcMsg); -void * mgmtCloneQueuedMsg(SQueuedMsg *pSrcMsg); -void mgmtFreeQueuedMsg(SQueuedMsg *pMsg); - #ifdef __cplusplus } #endif diff --git a/src/mnode/inc/mgmtSdb.h b/src/mnode/inc/mgmtSdb.h index c09d215adb..2b96eb4005 100644 --- a/src/mnode/inc/mgmtSdb.h +++ b/src/mnode/inc/mgmtSdb.h @@ -72,6 +72,7 @@ void sdbCleanUp(); void * sdbOpenTable(SSdbTableDesc *desc); void sdbCloseTable(void *handle); bool sdbIsMaster(); +bool sdbIsServing(); void sdbUpdateMnodeRoles(); int32_t sdbInsertRow(SSdbOper *pOper); diff --git a/src/mnode/inc/mgmtShell.h b/src/mnode/inc/mgmtShell.h index 3941a0a87d..c3ae3e96e8 100644 --- a/src/mnode/inc/mgmtShell.h +++ b/src/mnode/inc/mgmtShell.h @@ -34,6 +34,14 @@ void mgmtAddToShellQueue(SQueuedMsg *queuedMsg); void mgmtDealyedAddToShellQueue(SQueuedMsg *queuedMsg); void mgmtSendSimpleResp(void *thandle, int32_t code); +bool mgmtCheckQhandle(uint64_t qhandle); +void *mgmtSaveQhandle(void *qhandle, int32_t size); +void mgmtFreeQhandle(void *qhandle, bool forceRemove); + +void *mgmtMallocQueuedMsg(SRpcMsg *rpcMsg); +void *mgmtCloneQueuedMsg(SQueuedMsg *pSrcMsg); +void mgmtFreeQueuedMsg(SQueuedMsg *pMsg); + #ifdef __cplusplus } #endif diff --git a/src/mnode/inc/mgmtTable.h b/src/mnode/inc/mgmtTable.h index 03d31d8e4b..9c4aa4a2a5 100644 --- a/src/mnode/inc/mgmtTable.h +++ b/src/mnode/inc/mgmtTable.h @@ -22,13 +22,15 @@ extern "C" { #include "mgmtDef.h" -int32_t mgmtInitTables(); -void mgmtCleanUpTables(); -STableObj* mgmtGetTable(char* tableId); -void mgmtIncTableRef(void *pTable); -void mgmtDecTableRef(void *pTable); -void mgmtDropAllChildTables(SDbObj *pDropDb); -void mgmtDropAllSuperTables(SDbObj *pDropDb); +int32_t mgmtInitTables(); +void mgmtCleanUpTables(); +void * mgmtGetTable(char *tableId); +void mgmtIncTableRef(void *pTable); +void mgmtDecTableRef(void *pTable); +void * mgmtGetNextChildTable(void *pNode, SChildTableObj **pTable); +void * mgmtGetNextSuperTable(void *pNode, SSuperTableObj **pTable); +void mgmtDropAllChildTables(SDbObj *pDropDb); +void mgmtDropAllSuperTables(SDbObj *pDropDb); #ifdef __cplusplus } diff --git a/src/mnode/inc/mgmtUser.h b/src/mnode/inc/mgmtUser.h index d0fd03de77..0a21b1f704 100644 --- a/src/mnode/inc/mgmtUser.h +++ b/src/mnode/inc/mgmtUser.h @@ -27,7 +27,7 @@ SUserObj *mgmtGetUser(char *name); void * mgmtGetNextUser(void *pNode, SUserObj **pUser); void mgmtIncUserRef(SUserObj *pUser); void mgmtDecUserRef(SUserObj *pUser); -SUserObj *mgmtGetUserFromConn(void *pConn, bool *usePublicIp); +SUserObj *mgmtGetUserFromConn(void *pConn); int32_t mgmtCreateUser(SAcctObj *pAcct, char *name, char *pass); void mgmtDropAllUsers(SAcctObj *pAcct); diff --git a/src/mnode/inc/mgmtVgroup.h b/src/mnode/inc/mgmtVgroup.h index 058ed06f84..3f8dc35a00 100644 --- a/src/mnode/inc/mgmtVgroup.h +++ b/src/mnode/inc/mgmtVgroup.h @@ -32,7 +32,8 @@ void mgmtCleanUpVgroups(); SVgObj *mgmtGetVgroup(int32_t vgId); void mgmtIncVgroupRef(SVgObj *pVgroup); void mgmtDecVgroupRef(SVgObj *pVgroup); -void mgmtDropAllVgroups(SDbObj *pDropDb); +void mgmtDropAllDbVgroups(SDbObj *pDropDb); +void mgmtDropAllDnodeVgroups(SDnodeObj *pDropDnode); void * mgmtGetNextVgroup(void *pNode, SVgObj **pVgroup); void mgmtUpdateVgroup(SVgObj *pVgroup); @@ -50,7 +51,7 @@ void mgmtSendDropVnodeMsg(int32_t vgId, SRpcIpSet *ipSet, void *ahandle); void mgmtSendCreateVgroupMsg(SVgObj *pVgroup, void *ahandle); SRpcIpSet mgmtGetIpSetFromVgroup(SVgObj *pVgroup); -SRpcIpSet mgmtGetIpSetFromIp(uint32_t ip); +SRpcIpSet mgmtGetIpSetFromIp(char *ep); #ifdef __cplusplus } diff --git a/src/mnode/src/mgmtAcct.c b/src/mnode/src/mgmtAcct.c index f9e2c8b105..9b7815af12 100644 --- a/src/mnode/src/mgmtAcct.c +++ b/src/mnode/src/mgmtAcct.c @@ -27,8 +27,8 @@ #include "mgmtUser.h" void * tsAcctSdb = NULL; -int32_t tsAcctUpdateSize; -static void mgmtCreateRootAcct(); +static int32_t tsAcctUpdateSize; +static void mgmtCreateRootAcct(); static int32_t mgmtActionAcctDestroy(SSdbOper *pOper) { SAcctObj *pAcct = pOper->pObj; diff --git a/src/mnode/src/mgmtBalance.c b/src/mnode/src/mgmtBalance.c index c6c10e0da0..17d4a4114b 100644 --- a/src/mnode/src/mgmtBalance.c +++ b/src/mnode/src/mgmtBalance.c @@ -35,7 +35,7 @@ int32_t balanceAllocVnodes(SVgObj *pVgroup) { void * pNode = NULL; SDnodeObj *pDnode = NULL; SDnodeObj *pSelDnode = NULL; - float vnodeUsage = 1.0; + float vnodeUsage = 1000.0; while (1) { pNode = mgmtGetNextDnode(pNode, &pDnode); diff --git a/src/mnode/src/mgmtDClient.c b/src/mnode/src/mgmtDClient.c index 759d400eb8..229964e1d6 100644 --- a/src/mnode/src/mgmtDClient.c +++ b/src/mnode/src/mgmtDClient.c @@ -38,7 +38,6 @@ static void *tsMgmtDClientRpc = NULL; int32_t mgmtInitDClient() { SRpcInit rpcInit = {0}; - rpcInit.localIp = tsAnyIp ? "0.0.0.0" : tsPrivateIp; rpcInit.localPort = 0; rpcInit.label = "MND-DC"; rpcInit.numOfThreads = 1; diff --git a/src/mnode/src/mgmtDServer.c b/src/mnode/src/mgmtDServer.c index 9f65cd5d4a..726554e490 100644 --- a/src/mnode/src/mgmtDServer.c +++ b/src/mnode/src/mgmtDServer.c @@ -43,7 +43,6 @@ static void *tsMgmtDServerQhandle = NULL; int32_t mgmtInitDServer() { SRpcInit rpcInit = {0}; - rpcInit.localIp = tsAnyIp ? "0.0.0.0" : tsPrivateIp;; rpcInit.localPort = tsMnodeDnodePort; rpcInit.label = "MND-DS"; rpcInit.numOfThreads = 1; @@ -105,14 +104,13 @@ static void mgmtProcessMsgFromDnode(SRpcMsg *rpcMsg) { if (!sdbIsMaster()) { SRpcConnInfo connInfo; rpcGetConnInfo(rpcMsg->handle, &connInfo); - bool usePublicIp = false; SRpcIpSet ipSet = {0}; - ipSet.port = tsMnodeDnodePort; - dnodeGetMnodeIpSet(&ipSet, usePublicIp); + dnodeGetMnodeDnodeIpSet(&ipSet); + mTrace("conn from dnode ip:%s user:%s redirect msg, inUse:%d", taosIpStr(connInfo.clientIp), connInfo.user, ipSet.inUse); for (int32_t i = 0; i < ipSet.numOfIps; ++i) { - mTrace("index:%d ip:%s", i, taosIpStr(ipSet.ip[i])); + mTrace("index:%d %s:%d", i, ipSet.fqdn[i], ipSet.port[i]); } rpcSendRedirectRsp(rpcMsg->handle, &ipSet); return; diff --git a/src/mnode/src/mgmtDb.c b/src/mnode/src/mgmtDb.c index c7f6ef4a4d..3e7577af06 100644 --- a/src/mnode/src/mgmtDb.c +++ b/src/mnode/src/mgmtDb.c @@ -36,7 +36,7 @@ #include "mgmtUser.h" #include "mgmtVgroup.h" -void * tsDbSdb = NULL; +static void * tsDbSdb = NULL; static int32_t tsDbUpdateSize; static int32_t mgmtCreateDb(SAcctObj *pAcct, SCMCreateDbMsg *pCreate); @@ -82,7 +82,7 @@ static int32_t mgmtDbActionDelete(SSdbOper *pOper) { mgmtDropDbFromAcct(pAcct, pDb); mgmtDropAllChildTables(pDb); mgmtDropAllSuperTables(pDb); - mgmtDropAllVgroups(pDb); + mgmtDropAllDbVgroups(pDb); mgmtDecAcctRef(pAcct); return TSDB_CODE_SUCCESS; @@ -95,6 +95,7 @@ static int32_t mgmtDbActionUpdate(SSdbOper *pOper) { memcpy(pSaved, pDb, pOper->rowSize); free(pDb); } + mgmtDecDbRef(pSaved); return TSDB_CODE_SUCCESS; } @@ -154,6 +155,10 @@ int32_t mgmtInitDbs() { return 0; } +void *mgmtGetNextDb(void *pNode, SDbObj **pDb) { + return sdbFetchRow(tsDbSdb, pNode, (void **)pDb); +} + SDbObj *mgmtGetDb(char *db) { return (SDbObj *)sdbGetRow(tsDbSdb, db); } @@ -174,7 +179,7 @@ SDbObj *mgmtGetDbByTableId(char *tableId) { memset(db, 0, sizeof(db)); strncpy(db, tableId, pos - tableId); - return (SDbObj *)sdbGetRow(tsDbSdb, db); + return mgmtGetDb(db); } static int32_t mgmtCheckDbCfg(SDbCfg *pCfg) { @@ -346,8 +351,27 @@ bool mgmtCheckIsMonitorDB(char *db, char *monitordb) { return (strncasecmp(dbName, monitordb, len) == 0 && len == strlen(monitordb)); } +#if 0 +void mgmtPrintVgroups(SDbObj *pDb, char *oper) { + mPrint("db:%s, vgroup link from head, oper:%s", pDb->name, oper); + SVgObj *pVgroup = pDb->pHead; + while (pVgroup != NULL) { + mPrint("vgId:%d", pVgroup->vgId); + pVgroup = pVgroup->next; + } + + mPrint("db:%s, vgroup link from tail", pDb->name, pDb->numOfVgroups); + pVgroup = pDb->pTail; + while (pVgroup != NULL) { + mPrint("vgId:%d", pVgroup->vgId); + pVgroup = pVgroup->prev; + } +} +#endif + void mgmtAddVgroupIntoDb(SVgObj *pVgroup) { SDbObj *pDb = pVgroup->pDb; + pVgroup->next = pDb->pHead; pVgroup->prev = NULL; @@ -397,7 +421,7 @@ static int32_t mgmtGetDbMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) int32_t cols = 0; SSchema *pSchema = pMeta->schema; - SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL); + SUserObj *pUser = mgmtGetUserFromConn(pConn); if (pUser == NULL) return 0; pShow->bytes[cols] = TSDB_DB_NAME_LEN; @@ -545,11 +569,11 @@ static int32_t mgmtRetrieveDbs(SShowObj *pShow, char *data, int32_t rows, void * SDbObj *pDb = NULL; char * pWrite; int32_t cols = 0; - SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL); + SUserObj *pUser = mgmtGetUserFromConn(pConn); if (pUser == NULL) return 0; while (numOfRows < rows) { - pShow->pNode = sdbFetchRow(tsDbSdb, pShow->pNode, (void **) &pDb); + pShow->pNode = mgmtGetNextDb(pShow->pNode, &pDb); if (pDb == NULL) break; cols = 0; @@ -674,8 +698,7 @@ static int32_t mgmtSetDbDropping(SDbObj *pDb) { SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsDbSdb, - .pObj = pDb, - .rowSize = tsDbUpdateSize + .pObj = pDb }; int32_t code = sdbUpdateRow(&oper); @@ -770,11 +793,17 @@ static SDbCfg mgmtGetAlterDbOption(SDbObj *pDb, SCMAlterDbMsg *pAlter) { mTrace("db:%s, replications:%d change to %d", pDb->name, pDb->cfg.replications, replications); newCfg.replications = replications; } + if (replications > mgmtGetDnodesNum()) { mError("db:%s, no enough dnode to change replica:%d", pDb->name, replications); terrno = TSDB_CODE_NO_ENOUGH_DNODES; } - + + if (pDb->cfg.replications - replications >= 2) { + mError("db:%s, replica number can't change from 3 to 1", pDb->name, replications); + terrno = TSDB_CODE_INVALID_OPTION; + } + return newCfg; } @@ -797,8 +826,7 @@ static int32_t mgmtAlterDb(SDbObj *pDb, SCMAlterDbMsg *pAlter) { SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsDbSdb, - .pObj = pDb, - .rowSize = tsDbUpdateSize + .pObj = pDb }; int32_t code = sdbUpdateRow(&oper); @@ -833,21 +861,21 @@ static void mgmtProcessAlterDbMsg(SQueuedMsg *pMsg) { return; } - SDbObj *pDb = pMsg->pDb = mgmtGetDb(pAlter->db); - if (pDb == NULL) { + if (pMsg->pDb == NULL) pMsg->pDb = mgmtGetDb(pAlter->db); + if (pMsg->pDb == NULL) { mError("db:%s, failed to alter, invalid db", pAlter->db); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_INVALID_DB); return; } - int32_t code = mgmtAlterDb(pDb, pAlter); + int32_t code = mgmtAlterDb(pMsg->pDb, pAlter); if (code != TSDB_CODE_SUCCESS) { mError("db:%s, failed to alter, invalid db option", pAlter->db); mgmtSendSimpleResp(pMsg->thandle, code); return; } - mTrace("db:%s, all vgroups is altered", pDb->name); + mTrace("db:%s, all vgroups is altered", pMsg->pDb->name); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_SUCCESS); } @@ -878,8 +906,8 @@ static void mgmtProcessDropDbMsg(SQueuedMsg *pMsg) { return; } - SDbObj *pDb = pMsg->pDb = mgmtGetDb(pDrop->db); - if (pDb == NULL) { + if (pMsg->pDb == NULL) pMsg->pDb = mgmtGetDb(pDrop->db); + if (pMsg->pDb == NULL) { if (pDrop->ignoreNotExists) { mTrace("db:%s, db is not exist, think drop success", pDrop->db); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_SUCCESS); @@ -891,30 +919,32 @@ static void mgmtProcessDropDbMsg(SQueuedMsg *pMsg) { } } - if (mgmtCheckIsMonitorDB(pDb->name, tsMonitorDbName)) { + if (mgmtCheckIsMonitorDB(pMsg->pDb->name, tsMonitorDbName)) { mError("db:%s, can't drop monitor database", pDrop->db); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_MONITOR_DB_FORBIDDEN); return; } - int32_t code = mgmtSetDbDropping(pDb); + int32_t code = mgmtSetDbDropping(pMsg->pDb); if (code != TSDB_CODE_SUCCESS) { mError("db:%s, failed to drop, reason:%s", pDrop->db, tstrerror(code)); mgmtSendSimpleResp(pMsg->thandle, code); return; } - SVgObj *pVgroup = pDb->pHead; +#if 0 + SVgObj *pVgroup = pMsg->pDb->pHead; if (pVgroup != NULL) { - mPrint("vgroup:%d, will be dropped", pVgroup->vgId); + mPrint("vgId:%d, will be dropped", pVgroup->vgId); SQueuedMsg *newMsg = mgmtCloneQueuedMsg(pMsg); newMsg->ahandle = pVgroup; newMsg->expected = pVgroup->numOfVnodes; mgmtDropVgroup(pVgroup, newMsg); return; } +#endif - mTrace("db:%s, all vgroups is dropped", pDb->name); + mTrace("db:%s, all vgroups is dropped", pMsg->pDb->name); mgmtDropDb(pMsg); } @@ -926,7 +956,7 @@ void mgmtDropAllDbs(SAcctObj *pAcct) { mPrint("acct:%s, all dbs will be dropped from sdb", pAcct->user); while (1) { - pNode = sdbFetchRow(tsDbSdb, pNode, (void **)&pDb); + pNode = mgmtGetNextDb(pNode, &pDb); if (pDb == NULL) break; if (pDb->pAcct == pAcct) { diff --git a/src/mnode/src/mgmtDnode.c b/src/mnode/src/mgmtDnode.c index 5d34d3fcf2..c7643b9bf9 100644 --- a/src/mnode/src/mgmtDnode.c +++ b/src/mnode/src/mgmtDnode.c @@ -36,13 +36,13 @@ #include "mgmtUser.h" #include "mgmtVgroup.h" -void *tsDnodeSdb = NULL; -int32_t tsDnodeUpdateSize = 0; int32_t tsAccessSquence = 0; +static void *tsDnodeSdb = NULL; +static int32_t tsDnodeUpdateSize = 0; extern void * tsMnodeSdb; extern void * tsVgroupSdb; -static int32_t mgmtCreateDnode(uint32_t ip); +static int32_t mgmtCreateDnode(char *ep); static void mgmtProcessCreateDnodeMsg(SQueuedMsg *pMsg); static void mgmtProcessDropDnodeMsg(SQueuedMsg *pMsg); static void mgmtProcessCfgDnodeMsg(SQueuedMsg *pMsg); @@ -68,50 +68,17 @@ static int32_t mgmtDnodeActionInsert(SSdbOper *pOper) { pDnode->status = TAOS_DN_STATUS_OFFLINE; } - pDnode->mnodeShellPort = tsMnodeShellPort; - pDnode->mnodeDnodePort = tsMnodeDnodePort; - pDnode->dnodeShellPort = tsDnodeShellPort; - pDnode->dnodeMnodePort = tsDnodeMnodePort; - pDnode->syncPort = tsSyncPort; - return TSDB_CODE_SUCCESS; } static int32_t mgmtDnodeActionDelete(SSdbOper *pOper) { SDnodeObj *pDnode = pOper->pObj; - void * pNode = NULL; - void * pLastNode = NULL; - SVgObj * pVgroup = NULL; - int32_t numOfVgroups = 0; - - while (1) { - pLastNode = pNode; - pNode = sdbFetchRow(tsVgroupSdb, pNode, (void **)&pVgroup); - if (pVgroup == NULL) break; - - if (pVgroup->vnodeGid[0].dnodeId == pDnode->dnodeId) { - SSdbOper oper = { - .type = SDB_OPER_LOCAL, - .table = tsVgroupSdb, - .pObj = pVgroup, - }; - sdbDeleteRow(&oper); - pNode = pLastNode; - numOfVgroups++; - continue; - } - } - - SMnodeObj *pMnode = mgmtGetMnode(pDnode->dnodeId); - if (pMnode != NULL) { - SSdbOper oper = {.type = SDB_OPER_LOCAL, .table = tsMnodeSdb, .pObj = pMnode}; - sdbDeleteRow(&oper); - mgmtReleaseMnode(pMnode); - } - + + mgmtDropAllDnodeVgroups(pDnode); + mgmtDropMnodeLocal(pDnode->dnodeId); balanceNotify(); - mTrace("dnode:%d, all vgroups:%d is dropped from sdb", pDnode->dnodeId, numOfVgroups); + mTrace("dnode:%d, all vgroups is dropped from sdb", pDnode->dnodeId); return TSDB_CODE_SUCCESS; } @@ -122,6 +89,7 @@ static int32_t mgmtDnodeActionUpdate(SSdbOper *pOper) { memcpy(pSaved, pDnode, pOper->rowSize); free(pDnode); } + mgmtDecDnodeRef(pSaved); return TSDB_CODE_SUCCESS; } @@ -144,9 +112,8 @@ static int32_t mgmtDnodeActionDecode(SSdbOper *pOper) { static int32_t mgmtDnodeActionRestored() { int32_t numOfRows = sdbGetNumOfRows(tsDnodeSdb); if (numOfRows <= 0 && dnodeIsFirstDeploy()) { - uint32_t ip = inet_addr(tsPrivateIp); - mgmtCreateDnode(ip); - SDnodeObj *pDnode = mgmtGetDnodeByIp(ip); + mgmtCreateDnode(tsLocalEp); + SDnodeObj *pDnode = mgmtGetDnodeByIp(tsLocalEp); mgmtAddMnode(pDnode->dnodeId); mgmtDecDnodeRef(pDnode); } @@ -214,14 +181,14 @@ void *mgmtGetDnode(int32_t dnodeId) { return sdbGetRow(tsDnodeSdb, &dnodeId); } -void *mgmtGetDnodeByIp(uint32_t ip) { +void *mgmtGetDnodeByIp(char *ep) { SDnodeObj *pDnode = NULL; void * pNode = NULL; while (1) { - pNode = sdbFetchRow(tsDnodeSdb, pNode, (void**)&pDnode); + pNode = mgmtGetNextDnode(pNode, &pDnode); if (pDnode == NULL) break; - if (ip == pDnode->privateIp) { + if (strcmp(ep, pDnode->dnodeEp) == 0) { return pDnode; } mgmtDecDnodeRef(pDnode); @@ -242,8 +209,7 @@ void mgmtUpdateDnode(SDnodeObj *pDnode) { SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsDnodeSdb, - .pObj = pDnode, - .rowSize = tsDnodeUpdateSize + .pObj = pDnode }; sdbUpdateRow(&oper); @@ -253,19 +219,18 @@ void mgmtProcessCfgDnodeMsg(SQueuedMsg *pMsg) { SRpcMsg rpcRsp = {.handle = pMsg->thandle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; SCMCfgDnodeMsg *pCmCfgDnode = pMsg->pCont; - if (pCmCfgDnode->ip[0] == 0) { - strcpy(pCmCfgDnode->ip, tsPrivateIp); + if (pCmCfgDnode->ep[0] == 0) { + strcpy(pCmCfgDnode->ep, tsLocalEp); } else { - strcpy(pCmCfgDnode->ip, pCmCfgDnode->ip); + strcpy(pCmCfgDnode->ep, pCmCfgDnode->ep); } - uint32_t dnodeIp = inet_addr(pCmCfgDnode->ip); if (strcmp(pMsg->pUser->user, "root") != 0) { rpcRsp.code = TSDB_CODE_NO_RIGHTS; } else { - SRpcIpSet ipSet = mgmtGetIpSetFromIp(dnodeIp); + SRpcIpSet ipSet = mgmtGetIpSetFromIp(pCmCfgDnode->ep); SMDCfgDnodeMsg *pMdCfgDnode = rpcMallocCont(sizeof(SMDCfgDnodeMsg)); - strcpy(pMdCfgDnode->ip, pCmCfgDnode->ip); + strcpy(pMdCfgDnode->ep, pCmCfgDnode->ep); strcpy(pMdCfgDnode->config, pCmCfgDnode->config); SRpcMsg rpcMdCfgDnodeMsg = { .handle = 0, @@ -279,7 +244,7 @@ void mgmtProcessCfgDnodeMsg(SQueuedMsg *pMsg) { } if (rpcRsp.code == TSDB_CODE_SUCCESS) { - mPrint("dnode:%s, is configured by %s", pCmCfgDnode->ip, pMsg->pUser->user); + mPrint("dnode:%s, is configured by %s", pCmCfgDnode->ep, pMsg->pUser->user); } rpcSendResponse(&rpcRsp); @@ -292,8 +257,6 @@ static void mgmtProcessCfgDnodeMsgRsp(SRpcMsg *rpcMsg) { void mgmtProcessDnodeStatusMsg(SRpcMsg *rpcMsg) { SDMStatusMsg *pStatus = rpcMsg->pCont; pStatus->dnodeId = htonl(pStatus->dnodeId); - pStatus->privateIp = htonl(pStatus->privateIp); - pStatus->publicIp = htonl(pStatus->publicIp); pStatus->moduleStatus = htonl(pStatus->moduleStatus); pStatus->lastReboot = htonl(pStatus->lastReboot); pStatus->numOfCores = htons(pStatus->numOfCores); @@ -308,23 +271,21 @@ void mgmtProcessDnodeStatusMsg(SRpcMsg *rpcMsg) { SDnodeObj *pDnode = NULL; if (pStatus->dnodeId == 0) { - pDnode = mgmtGetDnodeByIp(pStatus->privateIp); + pDnode = mgmtGetDnodeByIp(pStatus->dnodeEp); if (pDnode == NULL) { - mTrace("dnode not created, privateIp:%s", taosIpStr(pStatus->privateIp)); + mTrace("dnode %s not created", pStatus->dnodeEp); mgmtSendSimpleResp(rpcMsg->handle, TSDB_CODE_DNODE_NOT_EXIST); return; } } else { pDnode = mgmtGetDnode(pStatus->dnodeId); if (pDnode == NULL) { - mError("dnode:%d, not exist, privateIp:%s", pStatus->dnodeId, taosIpStr(pStatus->privateIp)); + mError("dnode id:%d, %s not exist", pStatus->dnodeId, pStatus->dnodeEp); mgmtSendSimpleResp(rpcMsg->handle, TSDB_CODE_DNODE_NOT_EXIST); return; } } - - pDnode->privateIp = pStatus->privateIp; - pDnode->publicIp = pStatus->publicIp; + pDnode->lastReboot = pStatus->lastReboot; pDnode->numOfCores = pStatus->numOfCores; pDnode->diskAvailable = pStatus->diskAvailable; @@ -334,7 +295,7 @@ void mgmtProcessDnodeStatusMsg(SRpcMsg *rpcMsg) { pDnode->lastAccess = tsAccessSquence; if (pStatus->dnodeId == 0) { - mTrace("dnode:%d, first access, privateIp:%s, name:%s", pDnode->dnodeId, taosIpStr(pDnode->privateIp), pDnode->dnodeName); + mTrace("dnode:%d %s, first access", pDnode->dnodeId, pDnode->dnodeEp); } else { //mTrace("dnode:%d, status received, access times %d", pDnode->dnodeId, pDnode->lastAccess); } @@ -347,8 +308,8 @@ void mgmtProcessDnodeStatusMsg(SRpcMsg *rpcMsg) { SVgObj *pVgroup = mgmtGetVgroup(pVload->vgId); if (pVgroup == NULL) { - SRpcIpSet ipSet = mgmtGetIpSetFromIp(pDnode->privateIp); - mPrint("dnode:%d, vgroup:%d not exist in mnode, drop it", pDnode->dnodeId, pVload->vgId); + SRpcIpSet ipSet = mgmtGetIpSetFromIp(pDnode->dnodeEp); + mPrint("dnode:%d, vgId:%d not exist in mnode, drop it", pDnode->dnodeId, pVload->vgId); mgmtSendDropVnodeMsg(pVload->vgId, &ipSet, NULL); } else { mgmtUpdateVgroupStatus(pVgroup, pDnode, pVload); @@ -391,25 +352,25 @@ void mgmtProcessDnodeStatusMsg(SRpcMsg *rpcMsg) { rpcSendResponse(&rpcRsp); } -static int32_t mgmtCreateDnode(uint32_t ip) { +static int32_t mgmtCreateDnode(char *ep) { int32_t grantCode = grantCheck(TSDB_GRANT_DNODE); if (grantCode != TSDB_CODE_SUCCESS) { return grantCode; } - SDnodeObj *pDnode = mgmtGetDnodeByIp(ip); + SDnodeObj *pDnode = mgmtGetDnodeByIp(ep); if (pDnode != NULL) { - mError("dnode:%d is alredy exist, ip:%s", pDnode->dnodeId, taosIpStr(pDnode->privateIp)); + mgmtDecDnodeRef(pDnode); + mError("dnode:%d is alredy exist, %s:%d", pDnode->dnodeId, pDnode->dnodeFqdn, pDnode->dnodePort); return TSDB_CODE_DNODE_ALREADY_EXIST; } pDnode = (SDnodeObj *) calloc(1, sizeof(SDnodeObj)); - pDnode->privateIp = ip; - pDnode->publicIp = ip; pDnode->createdTime = taosGetTimestampMs(); pDnode->status = TAOS_DN_STATUS_OFFLINE; pDnode->totalVnodes = TSDB_INVALID_VNODE_NUM; - sprintf(pDnode->dnodeName, "n%d", sdbGetId(tsDnodeSdb) + 1); + strcpy(pDnode->dnodeEp, ep); + taosGetFqdnPortFromEp(ep, pDnode->dnodeFqdn, &pDnode->dnodePort); SSdbOper oper = { .type = SDB_OPER_GLOBAL, @@ -446,15 +407,16 @@ int32_t mgmtDropDnode(SDnodeObj *pDnode) { return code; } -static int32_t mgmtDropDnodeByIp(uint32_t ip) { - SDnodeObj *pDnode = mgmtGetDnodeByIp(ip); +static int32_t mgmtDropDnodeByIp(char *ep) { + SDnodeObj *pDnode = mgmtGetDnodeByIp(ep); if (pDnode == NULL) { - mError("dnode:%s, is not exist", taosIpStr(ip)); + mError("dnode:%s, is not exist", ep); return TSDB_CODE_DNODE_NOT_EXIST; } - if (pDnode->privateIp == dnodeGetMnodeMasteIp()) { - mError("dnode:%d, can't drop dnode which is master", pDnode->dnodeId); + mgmtDecDnodeRef(pDnode); + if (strcmp(pDnode->dnodeEp, dnodeGetMnodeMasterEp()) == 0) { + mError("dnode:%d, can't drop dnode:%s which is master", pDnode->dnodeId, ep); return TSDB_CODE_NO_REMOVE_MASTER; } @@ -473,13 +435,13 @@ static void mgmtProcessCreateDnodeMsg(SQueuedMsg *pMsg) { if (strcmp(pMsg->pUser->user, "root") != 0) { rpcRsp.code = TSDB_CODE_NO_RIGHTS; } else { - uint32_t ip = inet_addr(pCreate->ip); - rpcRsp.code = mgmtCreateDnode(ip); + rpcRsp.code = mgmtCreateDnode(pCreate->ep); if (rpcRsp.code == TSDB_CODE_SUCCESS) { - SDnodeObj *pDnode = mgmtGetDnodeByIp(ip); - mLPrint("dnode:%d, ip:%s is created by %s", pDnode->dnodeId, pCreate->ip, pMsg->pUser->user); + SDnodeObj *pDnode = mgmtGetDnodeByIp(pCreate->ep); + mLPrint("dnode:%d, %s is created by %s", pDnode->dnodeId, pCreate->ep, pMsg->pUser->user); + mgmtDecDnodeRef(pDnode); } else { - mError("failed to create dnode:%s, reason:%s", pCreate->ip, tstrerror(rpcRsp.code)); + mError("failed to create dnode:%s, reason:%s", pCreate->ep, tstrerror(rpcRsp.code)); } } rpcSendResponse(&rpcRsp); @@ -490,15 +452,15 @@ static void mgmtProcessDropDnodeMsg(SQueuedMsg *pMsg) { SRpcMsg rpcRsp = {.handle = pMsg->thandle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; SCMDropDnodeMsg *pDrop = pMsg->pCont; + if (strcmp(pMsg->pUser->user, "root") != 0) { rpcRsp.code = TSDB_CODE_NO_RIGHTS; } else { - uint32_t ip = inet_addr(pDrop->ip); - rpcRsp.code = mgmtDropDnodeByIp(ip); + rpcRsp.code = mgmtDropDnodeByIp(pDrop->ep); if (rpcRsp.code == TSDB_CODE_SUCCESS) { - mLPrint("dnode:%s is dropped by %s", pDrop->ip, pMsg->pUser->user); + mLPrint("dnode:%s is dropped by %s", pDrop->ep, pMsg->pUser->user); } else { - mError("failed to drop dnode:%s, reason:%s", pDrop->ip, tstrerror(rpcRsp.code)); + mError("failed to drop dnode:%s, reason:%s", pDrop->ep, tstrerror(rpcRsp.code)); } } @@ -506,7 +468,7 @@ static void mgmtProcessDropDnodeMsg(SQueuedMsg *pMsg) { } static int32_t mgmtGetDnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) { - SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL); + SUserObj *pUser = mgmtGetUserFromConn(pConn); if (pUser == NULL) return 0; if (strcmp(pUser->pAcct->user, "root") != 0) { @@ -523,15 +485,9 @@ static int32_t mgmtGetDnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo pSchema[cols].bytes = htons(pShow->bytes[cols]); cols++; - pShow->bytes[cols] = 16; + pShow->bytes[cols] = 40; pSchema[cols].type = TSDB_DATA_TYPE_BINARY; - strcpy(pSchema[cols].name, "private ip"); - pSchema[cols].bytes = htons(pShow->bytes[cols]); - cols++; - - pShow->bytes[cols] = 16; - pSchema[cols].type = TSDB_DATA_TYPE_BINARY; - strcpy(pSchema[cols].name, "public ip"); + strcpy(pSchema[cols].name, "end point"); pSchema[cols].bytes = htons(pShow->bytes[cols]); cols++; @@ -581,7 +537,6 @@ static int32_t mgmtRetrieveDnodes(SShowObj *pShow, char *data, int32_t rows, voi int32_t cols = 0; SDnodeObj *pDnode = NULL; char *pWrite; - char ipstr[32]; while (numOfRows < rows) { pShow->pNode = mgmtGetNextDnode(pShow->pNode, &pDnode); @@ -593,14 +548,8 @@ static int32_t mgmtRetrieveDnodes(SShowObj *pShow, char *data, int32_t rows, voi *(int16_t *)pWrite = pDnode->dnodeId; cols++; - tinet_ntoa(ipstr, pDnode->privateIp); pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; - strcpy(pWrite, ipstr); - cols++; - - tinet_ntoa(ipstr, pDnode->publicIp); - pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; - strcpy(pWrite, ipstr); + strncpy(pWrite, pDnode->dnodeEp, pShow->bytes[cols]-1); cols++; pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; @@ -636,7 +585,7 @@ static bool mgmtCheckModuleInDnode(SDnodeObj *pDnode, int32_t moduleType) { static int32_t mgmtGetModuleMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) { int32_t cols = 0; - SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL); + SUserObj *pUser = mgmtGetUserFromConn(pConn); if (pUser == NULL) return 0; if (strcmp(pUser->user, "root") != 0) { @@ -652,9 +601,9 @@ static int32_t mgmtGetModuleMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pC pSchema[cols].bytes = htons(pShow->bytes[cols]); cols++; - pShow->bytes[cols] = 16; + pShow->bytes[cols] = 40; pSchema[cols].type = TSDB_DATA_TYPE_BINARY; - strcpy(pSchema[cols].name, "ip"); + strcpy(pSchema[cols].name, "end point"); pSchema[cols].bytes = htons(pShow->bytes[cols]); cols++; @@ -702,10 +651,8 @@ int32_t mgmtRetrieveModules(SShowObj *pShow, char *data, int32_t rows, void *pCo *(int16_t *)pWrite = pDnode->dnodeId; cols++; - char ipstr[20]; - tinet_ntoa(ipstr, pDnode->privateIp); pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; - strcpy(pWrite, ipstr); + strncpy(pWrite, pDnode->dnodeEp, pShow->bytes[cols]-1); cols++; pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; @@ -748,7 +695,7 @@ static bool mgmtCheckConfigShow(SGlobalCfg *cfg) { static int32_t mgmtGetConfigMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) { int32_t cols = 0; - SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL); + SUserObj *pUser = mgmtGetUserFromConn(pConn); if (pUser == NULL) return 0; if (strcmp(pUser->user, "root") != 0) { @@ -835,7 +782,7 @@ static int32_t mgmtRetrieveConfigs(SShowObj *pShow, char *data, int32_t rows, vo static int32_t mgmtGetVnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) { int32_t cols = 0; - SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL); + SUserObj *pUser = mgmtGetUserFromConn(pConn); if (pUser == NULL) return 0; if (strcmp(pUser->user, "root") != 0) { @@ -865,8 +812,7 @@ static int32_t mgmtGetVnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo SDnodeObj *pDnode = NULL; if (pShow->payloadLen > 0 ) { - uint32_t ip = ip2uint(pShow->payload); - pDnode = mgmtGetDnodeByIp(ip); + pDnode = mgmtGetDnodeByIp(pShow->payload); } else { mgmtGetNextDnode(NULL, (SDnodeObj **)&pDnode); } diff --git a/src/mnode/src/mgmtMain.c b/src/mnode/src/mgmtMain.c index e01b1e7756..0f18c95539 100644 --- a/src/mnode/src/mgmtMain.c +++ b/src/mnode/src/mgmtMain.c @@ -36,7 +36,7 @@ #include "mgmtTable.h" #include "mgmtShell.h" -void *tsMgmtTmr = NULL; +extern void *tsMgmtTmr; static bool tsMgmtIsRunning = false; int32_t mgmtStartSystem() { @@ -51,12 +51,6 @@ int32_t mgmtStartSystem() { mkdir(tsMnodeDir, 0755); } - tsMgmtTmr = taosTmrInit((tsMaxShellConns) * 3, 200, 3600000, "MND"); - if (tsMgmtTmr == NULL) { - mError("failed to init timer"); - return -1; - } - if (mgmtInitAccts() < 0) { mError("failed to init accts"); return -1; @@ -130,7 +124,7 @@ int32_t mgmtInitSystem() { struct stat dirstat; bool fileExist = (stat(tsMnodeDir, &dirstat) == 0); - bool asMaster = (strcmp(tsMasterIp, tsPrivateIp) == 0); + bool asMaster = (strcmp(tsFirst, tsLocalEp) == 0); if (asMaster || fileExist) { if (mgmtStartSystem() != 0) { diff --git a/src/mnode/src/mgmtMnode.c b/src/mnode/src/mgmtMnode.c index e8b1239380..940fdca4d8 100644 --- a/src/mnode/src/mgmtMnode.c +++ b/src/mnode/src/mgmtMnode.c @@ -30,7 +30,7 @@ #include "mgmtShell.h" #include "mgmtUser.h" -void * tsMnodeSdb = NULL; +static void * tsMnodeSdb = NULL; static int32_t tsMnodeUpdateSize = 0; static int32_t mgmtGetMnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn); static int32_t mgmtRetrieveMnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn); @@ -71,7 +71,7 @@ static int32_t mgmtMnodeActionUpdate(SSdbOper *pOper) { memcpy(pSaved, pMnode, pOper->rowSize); free(pMnode); } - + mgmtDecMnodeRef(pSaved); return TSDB_CODE_SUCCESS; } @@ -97,7 +97,7 @@ static int32_t mgmtMnodeActionRestored() { mgmtGetNextMnode(NULL, &pMnode); if (pMnode != NULL) { pMnode->role = TAOS_SYNC_ROLE_MASTER; - mgmtReleaseMnode(pMnode); + mgmtDecMnodeRef(pMnode); } } return TSDB_CODE_SUCCESS; @@ -148,7 +148,11 @@ void *mgmtGetMnode(int32_t mnodeId) { return sdbGetRow(tsMnodeSdb, &mnodeId); } -void mgmtReleaseMnode(SMnodeObj *pMnode) { +void mgmtIncMnodeRef(SMnodeObj *pMnode) { + sdbIncRef(tsMnodeSdb, pMnode); +} + +void mgmtDecMnodeRef(SMnodeObj *pMnode) { sdbDecRef(tsMnodeSdb, pMnode); } @@ -171,27 +175,23 @@ char *mgmtGetMnodeRoleStr(int32_t role) { } } -void mgmtGetMnodeIpSet(SRpcIpSet *ipSet, bool usePublicIp) { +void mgmtGetMnodeIpSet(SRpcIpSet *ipSet) { void *pNode = NULL; while (1) { SMnodeObj *pMnode = NULL; pNode = mgmtGetNextMnode(pNode, &pMnode); if (pMnode == NULL) break; - if (usePublicIp) { - ipSet->ip[ipSet->numOfIps] = htonl(pMnode->pDnode->publicIp); - } else { - ipSet->ip[ipSet->numOfIps] = htonl(pMnode->pDnode->privateIp); - } + strcpy(ipSet->fqdn[ipSet->numOfIps], pMnode->pDnode->dnodeFqdn); + ipSet->port[ipSet->numOfIps] = htons(pMnode->pDnode->dnodePort); if (pMnode->role == TAOS_SYNC_ROLE_MASTER) { ipSet->inUse = ipSet->numOfIps; } ipSet->numOfIps++; - ipSet->port = htons(pMnode->pDnode->mnodeShellPort); - mgmtReleaseMnode(pMnode); + mgmtDecMnodeRef(pMnode); } } @@ -207,16 +207,13 @@ void mgmtGetMnodeInfos(void *param) { if (pMnode == NULL) break; mnodes->nodeInfos[index].nodeId = htonl(pMnode->mnodeId); - mnodes->nodeInfos[index].nodeIp = htonl(pMnode->pDnode->privateIp); - mnodes->nodeInfos[index].nodePort = htons(pMnode->pDnode->mnodeDnodePort); - mnodes->nodeInfos[index].syncPort = htons(pMnode->pDnode->syncPort); - strcpy(mnodes->nodeInfos[index].nodeName, pMnode->pDnode->dnodeName); + strcpy(mnodes->nodeInfos[index].nodeEp, pMnode->pDnode->dnodeEp); if (pMnode->role == TAOS_SYNC_ROLE_MASTER) { mnodes->inUse = index; } index++; - mgmtReleaseMnode(pMnode); + mgmtDecMnodeRef(pMnode); } mnodes->nodeNum = index; @@ -242,8 +239,17 @@ int32_t mgmtAddMnode(int32_t dnodeId) { return code; } +void mgmtDropMnodeLocal(int32_t dnodeId) { + SMnodeObj *pMnode = mgmtGetMnode(dnodeId); + if (pMnode != NULL) { + SSdbOper oper = {.type = SDB_OPER_LOCAL, .table = tsMnodeSdb, .pObj = pMnode}; + sdbDeleteRow(&oper); + mgmtDecMnodeRef(pMnode); + } +} + int32_t mgmtDropMnode(int32_t dnodeId) { - SMnodeObj *pMnode = sdbGetRow(tsMnodeSdb, &dnodeId); + SMnodeObj *pMnode = mgmtGetMnode(dnodeId); if (pMnode == NULL) { return TSDB_CODE_DNODE_NOT_EXIST; } @@ -265,7 +271,7 @@ int32_t mgmtDropMnode(int32_t dnodeId) { static int32_t mgmtGetMnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) { sdbUpdateMnodeRoles(); - SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL); + SUserObj *pUser = mgmtGetUserFromConn(pConn); if (pUser == NULL) return 0; if (strcmp(pUser->pAcct->user, "root") != 0) { @@ -282,15 +288,9 @@ static int32_t mgmtGetMnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo pSchema[cols].bytes = htons(pShow->bytes[cols]); cols++; - pShow->bytes[cols] = 16; + pShow->bytes[cols] = 40; pSchema[cols].type = TSDB_DATA_TYPE_BINARY; - strcpy(pSchema[cols].name, "private ip"); - pSchema[cols].bytes = htons(pShow->bytes[cols]); - cols++; - - pShow->bytes[cols] = 16; - pSchema[cols].type = TSDB_DATA_TYPE_BINARY; - strcpy(pSchema[cols].name, "public ip"); + strcpy(pSchema[cols].name, "end point"); pSchema[cols].bytes = htons(pShow->bytes[cols]); cols++; @@ -327,7 +327,6 @@ static int32_t mgmtRetrieveMnodes(SShowObj *pShow, char *data, int32_t rows, voi int32_t cols = 0; SMnodeObj *pMnode = NULL; char *pWrite; - char ipstr[32]; while (numOfRows < rows) { pShow->pNode = mgmtGetNextMnode(pShow->pNode, &pMnode); @@ -339,14 +338,8 @@ static int32_t mgmtRetrieveMnodes(SShowObj *pShow, char *data, int32_t rows, voi *(int16_t *)pWrite = pMnode->mnodeId; cols++; - tinet_ntoa(ipstr, pMnode->pDnode->privateIp); pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; - strcpy(pWrite, ipstr); - cols++; - - tinet_ntoa(ipstr, pMnode->pDnode->publicIp); - pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; - strcpy(pWrite, ipstr); + strncpy(pWrite, pMnode->pDnode->dnodeEp, pShow->bytes[cols]-1); cols++; pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; @@ -359,7 +352,7 @@ static int32_t mgmtRetrieveMnodes(SShowObj *pShow, char *data, int32_t rows, voi numOfRows++; - mgmtReleaseMnode(pMnode); + mgmtDecMnodeRef(pMnode); } pShow->numOfReads += numOfRows; diff --git a/src/mnode/src/mgmtProfile.c b/src/mnode/src/mgmtProfile.c index b52a43569a..77871f037b 100644 --- a/src/mnode/src/mgmtProfile.c +++ b/src/mnode/src/mgmtProfile.c @@ -561,17 +561,6 @@ int32_t mgmtKillConnection(char *qidstr, void *pConn) { return TSDB_CODE_INVALID_CONNECTION; } -bool mgmtCheckQhandle(uint64_t qhandle) { - return true; -} - -void mgmtSaveQhandle(void *qhandle) { - mTrace("qhandle:%p is allocated", qhandle); -} - -void mgmtFreeQhandle(void *qhandle) { - mTrace("qhandle:%p is freed", qhandle); -} int mgmtGetConns(SShowObj *pShow, void *pConn) { // SAcctObj * pAcct = pConn->pAcct; @@ -686,7 +675,7 @@ int32_t mgmtRetrieveConns(SShowObj *pShow, char *data, int32_t rows, void *pConn void mgmtProcessKillQueryMsg(SQueuedMsg *pMsg) { SRpcMsg rpcRsp = {.handle = pMsg->thandle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; - SUserObj *pUser = mgmtGetUserFromConn(pMsg->thandle, NULL); + SUserObj *pUser = mgmtGetUserFromConn(pMsg->thandle); if (pUser == NULL) { rpcRsp.code = TSDB_CODE_INVALID_USER; rpcSendResponse(&rpcRsp); @@ -710,7 +699,7 @@ void mgmtProcessKillQueryMsg(SQueuedMsg *pMsg) { void mgmtProcessKillStreamMsg(SQueuedMsg *pMsg) { SRpcMsg rpcRsp = {.handle = pMsg->thandle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; - SUserObj *pUser = mgmtGetUserFromConn(pMsg->thandle, NULL); + SUserObj *pUser = mgmtGetUserFromConn(pMsg->thandle); if (pUser == NULL) { rpcRsp.code = TSDB_CODE_INVALID_USER; rpcSendResponse(&rpcRsp); @@ -734,7 +723,7 @@ void mgmtProcessKillStreamMsg(SQueuedMsg *pMsg) { void mgmtProcessKillConnectionMsg(SQueuedMsg *pMsg) { SRpcMsg rpcRsp = {.handle = pMsg->thandle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; - SUserObj *pUser = mgmtGetUserFromConn(pMsg->thandle, NULL); + SUserObj *pUser = mgmtGetUserFromConn(pMsg->thandle); if (pUser == NULL) { rpcRsp.code = TSDB_CODE_INVALID_USER; rpcSendResponse(&rpcRsp); @@ -771,52 +760,3 @@ int32_t mgmtInitProfile() { void mgmtCleanUpProfile() { } - -void *mgmtMallocQueuedMsg(SRpcMsg *rpcMsg) { - bool usePublicIp = false; - SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle, &usePublicIp); - if (pUser == NULL) { - return NULL; - } - - SQueuedMsg *pMsg = calloc(1, sizeof(SQueuedMsg)); - pMsg->thandle = rpcMsg->handle; - pMsg->msgType = rpcMsg->msgType; - pMsg->contLen = rpcMsg->contLen; - pMsg->pCont = rpcMsg->pCont; - pMsg->pUser = pUser; - pMsg->usePublicIp = usePublicIp; - - return pMsg; -} - -void mgmtFreeQueuedMsg(SQueuedMsg *pMsg) { - if (pMsg != NULL) { - rpcFreeCont(pMsg->pCont); - if (pMsg->pUser) mgmtDecUserRef(pMsg->pUser); - if (pMsg->pDb) mgmtDecDbRef(pMsg->pDb); - if (pMsg->pVgroup) mgmtDecVgroupRef(pMsg->pVgroup); - if (pMsg->pTable) mgmtDecTableRef(pMsg->pTable); - if (pMsg->pAcct) mgmtDecAcctRef(pMsg->pAcct); - if (pMsg->pDnode) mgmtDecDnodeRef(pMsg->pDnode); - free(pMsg); - } -} - -void* mgmtCloneQueuedMsg(SQueuedMsg *pSrcMsg) { - SQueuedMsg *pDestMsg = calloc(1, sizeof(SQueuedMsg)); - - pDestMsg->thandle = pSrcMsg->thandle; - pDestMsg->msgType = pSrcMsg->msgType; - pDestMsg->pCont = pSrcMsg->pCont; - pDestMsg->contLen = pSrcMsg->contLen; - pDestMsg->retry = pSrcMsg->retry; - pDestMsg->maxRetry= pSrcMsg->maxRetry; - pDestMsg->pUser = pSrcMsg->pUser; - pDestMsg->usePublicIp = pSrcMsg->usePublicIp; - - pSrcMsg->pCont = NULL; - pSrcMsg->pUser = NULL; - - return pDestMsg; -} \ No newline at end of file diff --git a/src/mnode/src/mgmtSdb.c b/src/mnode/src/mgmtSdb.c index 7359f95b61..53b9d2b814 100644 --- a/src/mnode/src/mgmtSdb.c +++ b/src/mnode/src/mgmtSdb.c @@ -40,7 +40,7 @@ typedef enum { typedef enum { SDB_STATUS_OFFLINE, SDB_STATUS_SERVING, - SDB_ACTION_CLOSING + SDB_STATUS_CLOSING } ESdbStatus; typedef struct _SSdbTable { @@ -107,6 +107,10 @@ bool sdbIsMaster() { return tsSdbObj.role == TAOS_SYNC_ROLE_MASTER; } +bool sdbIsServing() { + return tsSdbObj.status == SDB_STATUS_SERVING; +} + static char *sdbGetActionStr(int32_t action) { switch (action) { case SDB_ACTION_INSERT: @@ -180,7 +184,7 @@ void sdbUpdateMnodeRoles() { if (pMnode != NULL) { pMnode->role = roles.role[i]; sdbPrint("mnode:%d, role:%s", pMnode->mnodeId, mgmtGetMnodeRoleStr(pMnode->role)); - mgmtReleaseMnode(pMnode); + mgmtDecMnodeRef(pMnode); } } } @@ -231,8 +235,8 @@ void sdbUpdateSync() { for (int32_t i = 0; i < mnodes->nodeNum; ++i) { SDMMnodeInfo *node = &mnodes->nodeInfos[i]; syncCfg.nodeInfo[i].nodeId = node->nodeId; - syncCfg.nodeInfo[i].nodeIp = node->nodeIp; - strcpy(syncCfg.nodeInfo[i].name, node->nodeName); + taosGetFqdnPortFromEp(node->nodeEp, syncCfg.nodeInfo[i].nodeFqdn, &syncCfg.nodeInfo[i].nodePort); + syncCfg.nodeInfo[i].nodePort += TSDB_PORT_SYNC; index++; } @@ -244,21 +248,16 @@ void sdbUpdateSync() { if (pMnode == NULL) break; syncCfg.nodeInfo[index].nodeId = pMnode->mnodeId; - syncCfg.nodeInfo[index].nodeIp = pMnode->pDnode->privateIp; - strcpy(syncCfg.nodeInfo[index].name, pMnode->pDnode->dnodeName); + syncCfg.nodeInfo[index].nodePort = pMnode->pDnode->dnodePort + TSDB_PORT_SYNC; + strcpy(syncCfg.nodeInfo[index].nodeFqdn, pMnode->pDnode->dnodeEp); index++; - mgmtReleaseMnode(pMnode); + mgmtDecMnodeRef(pMnode); } } syncCfg.replica = index; - syncCfg.arbitratorIp = syncCfg.nodeInfo[0].nodeIp; - if (syncCfg.replica == 1) { - syncCfg.quorum = 1; - } else { - syncCfg.quorum = 2; - } + syncCfg.quorum = (syncCfg.replica == 1) ? 1:2; bool hasThisDnode = false; for (int32_t i = 0; i < syncCfg.replica; ++i) { @@ -271,10 +270,9 @@ void sdbUpdateSync() { if (!hasThisDnode) return; if (memcmp(&syncCfg, &tsSdbObj.cfg, sizeof(SSyncCfg)) == 0) return; - sdbPrint("work as mnode, replica:%d arbitratorIp:%s", syncCfg.replica, taosIpStr(syncCfg.arbitratorIp)); + sdbPrint("work as mnode, replica:%d", syncCfg.replica); for (int32_t i = 0; i < syncCfg.replica; ++i) { - sdbPrint("mnode:%d, ip:%s name:%s", syncCfg.nodeInfo[i].nodeId, taosIpStr(syncCfg.nodeInfo[i].nodeIp), - syncCfg.nodeInfo[i].name); + sdbPrint("mnode:%d, %s:%d", syncCfg.nodeInfo[i].nodeId, syncCfg.nodeInfo[i].nodeFqdn, syncCfg.nodeInfo[i].nodePort); } SSyncInfo syncInfo; @@ -320,6 +318,7 @@ int32_t sdbInit() { void sdbCleanUp() { if (tsSdbObj.status != SDB_STATUS_SERVING) return; + tsSdbObj.status = SDB_STATUS_CLOSING; syncStop(tsSdbObj.sync); free(tsSdbObj.sync); walClose(tsSdbObj.wal); @@ -333,7 +332,7 @@ void sdbIncRef(void *handle, void *pRow) { SSdbTable *pTable = handle; int32_t * pRefCount = (int32_t *)(pRow + pTable->refCountPos); atomic_add_fetch_32(pRefCount, 1); - if (0 && strcmp(pTable->tableName, "accounts") == 0) { + if (0 && pTable->tableId == SDB_TABLE_CTABLE) { sdbTrace("table:%s, add ref to record:%s:%s:%d", pTable->tableName, pTable->tableName, sdbGetkeyStr(pTable, pRow), *pRefCount); } @@ -345,7 +344,7 @@ void sdbDecRef(void *handle, void *pRow) { SSdbTable *pTable = handle; int32_t * pRefCount = (int32_t *)(pRow + pTable->refCountPos); int32_t refCount = atomic_sub_fetch_32(pRefCount, 1); - if (0 && strcmp(pTable->tableName, "accounts") == 0) { + if (0 && pTable->tableId == SDB_TABLE_CTABLE) { sdbTrace("table:%s, def ref of record:%s:%s:%d", pTable->tableName, pTable->tableName, sdbGetkeyStr(pTable, pRow), *pRefCount); } diff --git a/src/mnode/src/mgmtShell.c b/src/mnode/src/mgmtShell.c index f2545f43db..193521b026 100644 --- a/src/mnode/src/mgmtShell.c +++ b/src/mnode/src/mgmtShell.c @@ -23,6 +23,7 @@ #include "ttimer.h" #include "tgrant.h" #include "tglobal.h" +#include "tcache.h" #include "dnode.h" #include "mgmtDef.h" #include "mgmtLog.h" @@ -50,10 +51,11 @@ static void mgmtProcessHeartBeatMsg(SQueuedMsg *queuedMsg); static void mgmtProcessConnectMsg(SQueuedMsg *queuedMsg); static void mgmtProcessUseMsg(SQueuedMsg *queuedMsg); -extern void *tsMgmtTmr; +void *tsMgmtTmr; static void *tsMgmtShellRpc = NULL; static void *tsMgmtTranQhandle = NULL; static void (*tsMgmtProcessShellMsgFp[TSDB_MSG_TYPE_MAX])(SQueuedMsg *) = {0}; +static void *tsQhandleCache = NULL; static SShowMetaFp tsMgmtShowMetaFp[TSDB_MGMT_TABLE_MAX] = {0}; static SShowRetrieveFp tsMgmtShowRetrieveFp[TSDB_MGMT_TABLE_MAX] = {0}; @@ -64,7 +66,9 @@ int32_t mgmtInitShell() { mgmtAddShellMsgHandle(TSDB_MSG_TYPE_CM_CONNECT, mgmtProcessConnectMsg); mgmtAddShellMsgHandle(TSDB_MSG_TYPE_CM_USE_DB, mgmtProcessUseMsg); + tsMgmtTmr = taosTmrInit((tsMaxShellConns) * 3, 200, 3600000, "MND"); tsMgmtTranQhandle = taosInitScheduler(tsMaxShellConns, 1, "mnodeT"); + tsQhandleCache = taosCacheInit(tsMgmtTmr, 2); int32_t numOfThreads = tsNumOfCores * tsNumOfThreadsPerCore / 4.0; if (numOfThreads < 1) { @@ -72,7 +76,6 @@ int32_t mgmtInitShell() { } SRpcInit rpcInit = {0}; - rpcInit.localIp = tsAnyIp ? "0.0.0.0" : tsPrivateIp; rpcInit.localPort = tsMnodeShellPort; rpcInit.label = "MND-shell"; rpcInit.numOfThreads = numOfThreads; @@ -103,6 +106,12 @@ void mgmtCleanUpShell() { tsMgmtShellRpc = NULL; mPrint("server connection to shell is closed"); } + + if (tsQhandleCache) { + taosCacheEmpty(tsQhandleCache); + taosCacheCleanup(tsQhandleCache); + tsQhandleCache = NULL; + } } void mgmtAddShellMsgHandle(uint8_t showType, void (*fp)(SQueuedMsg *queuedMsg)) { @@ -148,14 +157,12 @@ static void mgmtProcessMsgFromShell(SRpcMsg *rpcMsg) { if (!sdbIsMaster()) { SRpcConnInfo connInfo; rpcGetConnInfo(rpcMsg->handle, &connInfo); - bool usePublicIp = (connInfo.serverIp == tsPublicIpInt); SRpcIpSet ipSet = {0}; - ipSet.port = tsMnodeShellPort; - dnodeGetMnodeIpSet(&ipSet, usePublicIp); + mgmtGetMnodeIpSet(&ipSet); mTrace("conn from shell ip:%s user:%s redirect msg, inUse:%d", taosIpStr(connInfo.clientIp), connInfo.user, ipSet.inUse); for (int32_t i = 0; i < ipSet.numOfIps; ++i) { - mTrace("index:%d ip:%s", i, taosIpStr(ipSet.ip[i])); + mTrace("index:%d ip:%s:%d", i, ipSet.fqdn[i], ipSet.port[i]); } rpcSendRedirectRsp(rpcMsg->handle, &ipSet); @@ -236,14 +243,15 @@ static void mgmtProcessShowMsg(SQueuedMsg *pMsg) { return; } - SShowObj *pShow = (SShowObj *) calloc(1, sizeof(SShowObj) + htons(pShowMsg->payloadLen)); + int32_t showObjSize = sizeof(SShowObj) + htons(pShowMsg->payloadLen); + SShowObj *pShow = (SShowObj *) calloc(1, showObjSize); pShow->signature = pShow; pShow->type = pShowMsg->type; pShow->payloadLen = htons(pShowMsg->payloadLen); strcpy(pShow->db, pShowMsg->db); memcpy(pShow->payload, pShowMsg->payload, pShow->payloadLen); - mgmtSaveQhandle(pShow); + pShow = mgmtSaveQhandle(pShow, showObjSize); pShowRsp->qhandle = htobe64((uint64_t) pShow); mTrace("show:%p, type:%s, start to get meta", pShow, mgmtGetShowTypeStr(pShowMsg->type)); @@ -258,10 +266,10 @@ static void mgmtProcessShowMsg(SQueuedMsg *pMsg) { rpcSendResponse(&rpcRsp); } else { mError("show:%p, type:%s, failed to get meta, reason:%s", pShow, mgmtGetShowTypeStr(pShowMsg->type), tstrerror(code)); - mgmtFreeQhandle(pShow); + mgmtFreeQhandle(pShow, false); SRpcMsg rpcRsp = { - .handle = pMsg->thandle, - .code = code + .handle = pMsg->thandle, + .code = code }; rpcSendResponse(&rpcRsp); } @@ -287,26 +295,20 @@ static void mgmtProcessRetrieveMsg(SQueuedMsg *pMsg) { SShowObj *pShow = (SShowObj *)pRetrieve->qhandle; mTrace("show:%p, type:%s, retrieve data", pShow, mgmtGetShowTypeStr(pShow->type)); - if (!mgmtCheckQhandle(pRetrieve->qhandle)) { - mError("pShow:%p, query memory is corrupted", pShow); - mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_MEMORY_CORRUPTED); - return; - } else { - if ((pRetrieve->free & TSDB_QUERY_TYPE_FREE_RESOURCE) != TSDB_QUERY_TYPE_FREE_RESOURCE) { - rowsToRead = pShow->numOfRows - pShow->numOfReads; - } - - /* return no more than 100 meters in one round trip */ - if (rowsToRead > 100) rowsToRead = 100; - - /* - * the actual number of table may be larger than the value of pShow->numOfRows, if a query is - * issued during a continuous create table operation. Therefore, rowToRead may be less than 0. - */ - if (rowsToRead < 0) rowsToRead = 0; - size = pShow->rowSize * rowsToRead; + if ((pRetrieve->free & TSDB_QUERY_TYPE_FREE_RESOURCE) != TSDB_QUERY_TYPE_FREE_RESOURCE) { + rowsToRead = pShow->numOfRows - pShow->numOfReads; } + /* return no more than 100 meters in one round trip */ + if (rowsToRead > 100) rowsToRead = 100; + + /* + * the actual number of table may be larger than the value of pShow->numOfRows, if a query is + * issued during a continuous create table operation. Therefore, rowToRead may be less than 0. + */ + if (rowsToRead < 0) rowsToRead = 0; + size = pShow->rowSize * rowsToRead; + size += 100; SRetrieveTableRsp *pRsp = rpcMallocCont(size); @@ -316,6 +318,7 @@ static void mgmtProcessRetrieveMsg(SQueuedMsg *pMsg) { if (rowsRead < 0) { // TSDB_CODE_ACTION_IN_PROGRESS; rpcFreeCont(pRsp); + mgmtFreeQhandle(pShow, false); return; } @@ -332,7 +335,9 @@ static void mgmtProcessRetrieveMsg(SQueuedMsg *pMsg) { rpcSendResponse(&rpcRsp); if (rowsToRead == 0) { - mgmtFreeQhandle(pShow); + mgmtFreeQhandle(pShow, true); + } else { + mgmtFreeQhandle(pShow, false); } } @@ -343,7 +348,7 @@ static void mgmtProcessHeartBeatMsg(SQueuedMsg *pMsg) { return; } - mgmtGetMnodeIpSet(&pHBRsp->ipList, pMsg->usePublicIp); + mgmtGetMnodeIpSet(&pHBRsp->ipList); /* * TODO @@ -416,6 +421,7 @@ static void mgmtProcessConnectMsg(SQueuedMsg *pMsg) { code = TSDB_CODE_INVALID_DB; goto connect_over; } + mgmtDecDbRef(pDb); } SCMConnectRsp *pConnectRsp = rpcMallocCont(sizeof(SCMConnectRsp)); @@ -429,7 +435,7 @@ static void mgmtProcessConnectMsg(SQueuedMsg *pMsg) { pConnectRsp->writeAuth = pUser->writeAuth; pConnectRsp->superAuth = pUser->superAuth; - mgmtGetMnodeIpSet(&pConnectRsp->ipList, pMsg->usePublicIp); + mgmtGetMnodeIpSet(&pConnectRsp->ipList); connect_over: rpcRsp.code = code; @@ -449,9 +455,8 @@ static void mgmtProcessUseMsg(SQueuedMsg *pMsg) { SCMUseDbMsg *pUseDbMsg = pMsg->pCont; // todo check for priority of current user - pMsg->pDb = mgmtGetDb(pUseDbMsg->db); - int32_t code = TSDB_CODE_SUCCESS; + if (pMsg->pDb == NULL) pMsg->pDb = mgmtGetDb(pUseDbMsg->db); if (pMsg->pDb == NULL) { code = TSDB_CODE_INVALID_DB; } @@ -465,7 +470,7 @@ static void mgmtProcessUseMsg(SQueuedMsg *pMsg) { */ static bool mgmtCheckTableMetaMsgReadOnly(SQueuedMsg *pMsg) { SCMTableInfoMsg *pInfo = pMsg->pCont; - pMsg->pTable = mgmtGetTable(pInfo->tableId); + if (pMsg->pTable == NULL) pMsg->pTable = mgmtGetTable(pInfo->tableId); if (pMsg->pTable != NULL) return true; // If table does not exists and autoCreate flag is set, we add the handler into task queue @@ -514,3 +519,79 @@ void mgmtSendSimpleResp(void *thandle, int32_t code) { }; rpcSendResponse(&rpcRsp); } + +bool mgmtCheckQhandle(uint64_t qhandle) { + void *pSaved = taosCacheAcquireByData(tsQhandleCache, (void *)qhandle); + if (pSaved == (void *)qhandle) { + mTrace("qhandle:%p is retrived", qhandle); + return true; + } else { + mTrace("qhandle:%p is already freed", qhandle); + return false; + } +} + +void* mgmtSaveQhandle(void *qhandle, int32_t size) { + if (tsQhandleCache != NULL) { + char key[24]; + sprintf(key, "show:%p", qhandle); + void *newQhandle = taosCachePut(tsQhandleCache, key, qhandle, size, 60); + free(qhandle); + + mTrace("qhandle:%p is saved", newQhandle); + return newQhandle; + } + + return NULL; +} + +void mgmtFreeQhandle(void *qhandle, bool forceRemove) { + mTrace("qhandle:%p is freed", qhandle); + taosCacheRelease(tsQhandleCache, &qhandle, forceRemove); +} + +void *mgmtMallocQueuedMsg(SRpcMsg *rpcMsg) { + SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); + if (pUser == NULL) { + return NULL; + } + + SQueuedMsg *pMsg = calloc(1, sizeof(SQueuedMsg)); + pMsg->thandle = rpcMsg->handle; + pMsg->msgType = rpcMsg->msgType; + pMsg->contLen = rpcMsg->contLen; + pMsg->pCont = rpcMsg->pCont; + pMsg->pUser = pUser; + + return pMsg; +} + +void mgmtFreeQueuedMsg(SQueuedMsg *pMsg) { + if (pMsg != NULL) { + rpcFreeCont(pMsg->pCont); + if (pMsg->pUser) mgmtDecUserRef(pMsg->pUser); + if (pMsg->pDb) mgmtDecDbRef(pMsg->pDb); + if (pMsg->pVgroup) mgmtDecVgroupRef(pMsg->pVgroup); + if (pMsg->pTable) mgmtDecTableRef(pMsg->pTable); + if (pMsg->pAcct) mgmtDecAcctRef(pMsg->pAcct); + if (pMsg->pDnode) mgmtDecDnodeRef(pMsg->pDnode); + free(pMsg); + } +} + +void* mgmtCloneQueuedMsg(SQueuedMsg *pSrcMsg) { + SQueuedMsg *pDestMsg = calloc(1, sizeof(SQueuedMsg)); + + pDestMsg->thandle = pSrcMsg->thandle; + pDestMsg->msgType = pSrcMsg->msgType; + pDestMsg->pCont = pSrcMsg->pCont; + pDestMsg->contLen = pSrcMsg->contLen; + pDestMsg->retry = pSrcMsg->retry; + pDestMsg->maxRetry= pSrcMsg->maxRetry; + pDestMsg->pUser = pSrcMsg->pUser; + + pSrcMsg->pCont = NULL; + pSrcMsg->pUser = NULL; + + return pDestMsg; +} \ No newline at end of file diff --git a/src/mnode/src/mgmtTable.c b/src/mnode/src/mgmtTable.c index 57e905361c..a1d260d1cf 100644 --- a/src/mnode/src/mgmtTable.c +++ b/src/mnode/src/mgmtTable.c @@ -41,8 +41,8 @@ #include "mgmtVgroup.h" #include "tcompare.h" -void * tsChildTableSdb; -void * tsSuperTableSdb; +static void * tsChildTableSdb; +static void * tsSuperTableSdb; static int32_t tsChildTableUpdateSize; static int32_t tsSuperTableUpdateSize; static void * mgmtGetChildTable(char *tableId); @@ -74,6 +74,7 @@ static void mgmtProcessTableCfgMsg(SRpcMsg *rpcMsg); static void mgmtProcessTableMetaMsg(SQueuedMsg *queueMsg); static void mgmtGetSuperTableMeta(SQueuedMsg *pMsg); static void mgmtGetChildTableMeta(SQueuedMsg *pMsg); +static void mgmtAutoCreateChildTable(SQueuedMsg *pMsg); static void mgmtProcessAlterTableMsg(SQueuedMsg *queueMsg); static void mgmtProcessAlterTableRsp(SRpcMsg *rpcMsg); @@ -96,14 +97,14 @@ static int32_t mgmtChildTableActionInsert(SSdbOper *pOper) { SVgObj *pVgroup = mgmtGetVgroup(pTable->vgId); if (pVgroup == NULL) { - mError("ctable:%s, not in vgroup:%d", pTable->info.tableId, pTable->vgId); + mError("ctable:%s, not in vgId:%d", pTable->info.tableId, pTable->vgId); return TSDB_CODE_INVALID_VGROUP_ID; } mgmtDecVgroupRef(pVgroup); SDbObj *pDb = mgmtGetDb(pVgroup->dbName); if (pDb == NULL) { - mError("ctable:%s, vgroup:%d not in db:%s", pTable->info.tableId, pVgroup->vgId, pVgroup->dbName); + mError("ctable:%s, vgId:%d not in db:%s", pTable->info.tableId, pVgroup->vgId, pVgroup->dbName); return TSDB_CODE_INVALID_DB; } mgmtDecDbRef(pDb); @@ -116,6 +117,7 @@ static int32_t mgmtChildTableActionInsert(SSdbOper *pOper) { mgmtDecAcctRef(pAcct); if (pTable->info.type == TSDB_CHILD_TABLE) { + // add ref pTable->superTable = mgmtGetSuperTable(pTable->superTableId); mgmtAddTableIntoStable(pTable->superTable, pTable); grantAdd(TSDB_GRANT_TIMESERIES, pTable->superTable->numOfColumns - 1); @@ -145,7 +147,7 @@ static int32_t mgmtChildTableActionDelete(SSdbOper *pOper) { SDbObj *pDb = mgmtGetDb(pVgroup->dbName); if (pDb == NULL) { - mError("ctable:%s, vgroup:%d not in DB:%s", pTable->info.tableId, pVgroup->vgId, pVgroup->dbName); + mError("ctable:%s, vgId:%d not in DB:%s", pTable->info.tableId, pVgroup->vgId, pVgroup->dbName); return TSDB_CODE_INVALID_DB; } mgmtDecDbRef(pDb); @@ -185,6 +187,7 @@ static int32_t mgmtChildTableActionUpdate(SSdbOper *pOper) { free(oldSql); free(oldSchema); } + mgmtDecTableRef(pTable); return TSDB_CODE_SUCCESS; } @@ -249,7 +252,7 @@ static int32_t mgmtChildTableActionRestored() { while (1) { pLastNode = pNode; mgmtDecTableRef(pTable); - pNode = sdbFetchRow(tsChildTableSdb, pNode, (void **)&pTable); + pNode = mgmtGetNextChildTable(pNode, &pTable); if (pTable == NULL) break; SDbObj *pDb = mgmtGetDbByTableId(pTable->info.tableId); @@ -267,7 +270,7 @@ static int32_t mgmtChildTableActionRestored() { SVgObj *pVgroup = mgmtGetVgroup(pTable->vgId); if (pVgroup == NULL) { - mError("ctable:%s, failed to get vgroup:%d sid:%d, discard it", pTable->info.tableId, pTable->vgId, pTable->sid); + mError("ctable:%s, failed to get vgId:%d sid:%d, discard it", pTable->info.tableId, pTable->vgId, pTable->sid); pTable->vgId = 0; SSdbOper desc = {0}; desc.type = SDB_OPER_LOCAL; @@ -280,7 +283,7 @@ static int32_t mgmtChildTableActionRestored() { mgmtDecVgroupRef(pVgroup); if (strcmp(pVgroup->dbName, pDb->name) != 0) { - mError("ctable:%s, db:%s not match with vgroup:%d db:%s sid:%d, discard it", + mError("ctable:%s, db:%s not match with vgId:%d db:%s sid:%d, discard it", pTable->info.tableId, pDb->name, pTable->vgId, pVgroup->dbName, pTable->sid); pTable->vgId = 0; SSdbOper desc = {0}; @@ -293,7 +296,7 @@ static int32_t mgmtChildTableActionRestored() { } if (pVgroup->tableList == NULL) { - mError("ctable:%s, vgroup:%d tableList is null", pTable->info.tableId, pTable->vgId); + mError("ctable:%s, vgId:%d tableList is null", pTable->info.tableId, pTable->vgId); pTable->vgId = 0; SSdbOper desc = {0}; desc.type = SDB_OPER_LOCAL; @@ -360,7 +363,7 @@ static void mgmtCleanUpChildTables() { static void mgmtAddTableIntoStable(SSuperTableObj *pStable, SChildTableObj *pCtable) { if (pStable->vgLen == 0) { - pStable->vgLen = 10; + pStable->vgLen = 8; pStable->vgList = calloc(pStable->vgLen, sizeof(int32_t)); } @@ -430,11 +433,11 @@ static int32_t mgmtSuperTableActionUpdate(SSdbOper *pOper) { void *oldSchema = pTable->schema; memcpy(pTable, pNew, pOper->rowSize); pTable->schema = pNew->schema; - free(pNew); free(pNew->vgList); + free(pNew); free(oldSchema); } - + mgmtDecTableRef(pTable); return TSDB_CODE_SUCCESS; } @@ -557,20 +560,28 @@ static void *mgmtGetSuperTable(char *tableId) { return sdbGetRow(tsSuperTableSdb, tableId); } -STableObj *mgmtGetTable(char *tableId) { - STableObj *tableInfo = sdbGetRow(tsSuperTableSdb, tableId); - if (tableInfo != NULL) { - return tableInfo; +void *mgmtGetTable(char *tableId) { + void *pTable = mgmtGetSuperTable(tableId); + if (pTable != NULL) { + return pTable; } - tableInfo = sdbGetRow(tsChildTableSdb, tableId); - if (tableInfo != NULL) { - return tableInfo; + pTable = mgmtGetChildTable(tableId); + if (pTable != NULL) { + return pTable; } return NULL; } +void *mgmtGetNextChildTable(void *pNode, SChildTableObj **pTable) { + return sdbFetchRow(tsChildTableSdb, pNode, (void **)pTable); +} + +void *mgmtGetNextSuperTable(void *pNode, SSuperTableObj **pTable) { + return sdbFetchRow(tsSuperTableSdb, pNode, (void **)pTable); +} + void mgmtIncTableRef(void *p1) { STableObj *pTable = (STableObj *)p1; if (pTable->type == TSDB_SUPER_TABLE) { @@ -612,9 +623,19 @@ static void mgmtExtractTableName(char* tableId, char* name) { static void mgmtProcessCreateTableMsg(SQueuedMsg *pMsg) { SCMCreateTableMsg *pCreate = pMsg->pCont; - pMsg->pTable = mgmtGetTable(pCreate->tableId); + if (pMsg->pDb == NULL) pMsg->pDb = mgmtGetDb(pCreate->db); + if (pMsg->pDb == NULL || pMsg->pDb->status != TSDB_DB_STATUS_READY) { + mError("table:%s, failed to create, db not selected", pCreate->tableId); + mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_DB_NOT_SELECTED); + return; + } + + if (pMsg->pTable == NULL) pMsg->pTable = mgmtGetTable(pCreate->tableId); if (pMsg->pTable != NULL && pMsg->retry == 0) { - if (pCreate->igExists) { + if (pCreate->getMeta) { + mTrace("table:%s, continue to get meta", pCreate->tableId); + mgmtGetChildTableMeta(pMsg); + } else if (pCreate->igExists) { mTrace("table:%s, is already exist", pCreate->tableId); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_SUCCESS); } else { @@ -624,13 +645,6 @@ static void mgmtProcessCreateTableMsg(SQueuedMsg *pMsg) { return; } - pMsg->pDb = mgmtGetDb(pCreate->db); - if (pMsg->pDb == NULL || pMsg->pDb->status != TSDB_DB_STATUS_READY) { - mError("table:%s, failed to create, db not selected", pCreate->tableId); - mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_DB_NOT_SELECTED); - return; - } - if (pCreate->numOfTags != 0) { mTrace("table:%s, create msg is received from thandle:%p", pCreate->tableId, pMsg->thandle); mgmtProcessCreateSuperTableMsg(pMsg); @@ -642,7 +656,7 @@ static void mgmtProcessCreateTableMsg(SQueuedMsg *pMsg) { static void mgmtProcessDropTableMsg(SQueuedMsg *pMsg) { SCMDropTableMsg *pDrop = pMsg->pCont; - pMsg->pDb = mgmtGetDbByTableId(pDrop->tableId); + if (pMsg->pDb == NULL) pMsg->pDb = mgmtGetDbByTableId(pDrop->tableId); if (pMsg->pDb == NULL || pMsg->pDb->status != TSDB_DB_STATUS_READY) { mError("table:%s, failed to drop table, db not selected", pDrop->tableId); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_DB_NOT_SELECTED); @@ -655,8 +669,8 @@ static void mgmtProcessDropTableMsg(SQueuedMsg *pMsg) { return; } - pMsg->pTable = mgmtGetTable(pDrop->tableId); - if (pMsg->pTable == NULL) { + if (pMsg->pTable == NULL) pMsg->pTable = mgmtGetTable(pDrop->tableId); + if (pMsg->pTable == NULL) { if (pDrop->igNotExists) { mTrace("table:%s, table is not exist, think drop success", pDrop->tableId); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_SUCCESS); @@ -679,17 +693,24 @@ static void mgmtProcessDropTableMsg(SQueuedMsg *pMsg) { static void mgmtProcessTableMetaMsg(SQueuedMsg *pMsg) { SCMTableInfoMsg *pInfo = pMsg->pCont; - mTrace("table:%s, table meta msg is received from thandle:%p", pInfo->tableId, pMsg->thandle); + pInfo->createFlag = htons(pInfo->createFlag); + mTrace("table:%s, table meta msg is received from thandle:%p, createFlag:%d", pInfo->tableId, pMsg->thandle, pInfo->createFlag); - pMsg->pDb = mgmtGetDbByTableId(pInfo->tableId); + if (pMsg->pDb == NULL) pMsg->pDb = mgmtGetDbByTableId(pInfo->tableId); if (pMsg->pDb == NULL || pMsg->pDb->status != TSDB_DB_STATUS_READY) { mError("table:%s, failed to get table meta, db not selected", pInfo->tableId); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_DB_NOT_SELECTED); return; } + if (pMsg->pTable == NULL) pMsg->pTable = mgmtGetTable(pInfo->tableId); if (pMsg->pTable == NULL) { - mgmtGetChildTableMeta(pMsg); + if (!pInfo->createFlag) { + mError("table:%s, failed to get table meta, table not exist", pInfo->tableId); + mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_INVALID_TABLE); + } else { + mgmtAutoCreateChildTable(pMsg); + } } else { if (pMsg->pTable->type != TSDB_SUPER_TABLE) { mgmtGetChildTableMeta(pMsg); @@ -776,8 +797,6 @@ static void mgmtProcessDropSuperTableMsg(SQueuedMsg *pMsg) { mgmtDecVgroupRef(pVgroup); } } - //mError("stable:%s, numOfTables:%d not 0", pStable->info.tableId, pStable->numOfTables); - //mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_OTHERS); } else { SSdbOper oper = { .type = SDB_OPER_GLOBAL, @@ -835,8 +854,7 @@ static int32_t mgmtAddSuperTableTag(SSuperTableObj *pStable, SSchema schema[], i SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsSuperTableSdb, - .pObj = pStable, - .rowSize = tsSuperTableUpdateSize + .pObj = pStable }; int32_t code = sdbUpdateRow(&oper); @@ -863,8 +881,7 @@ static int32_t mgmtDropSuperTableTag(SSuperTableObj *pStable, char *tagName) { SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsSuperTableSdb, - .pObj = pStable, - .rowSize = tsSuperTableUpdateSize + .pObj = pStable }; int32_t code = sdbUpdateRow(&oper); @@ -900,8 +917,7 @@ static int32_t mgmtModifySuperTableTagName(SSuperTableObj *pStable, char *oldTag SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsSuperTableSdb, - .pObj = pStable, - .rowSize = tsSuperTableUpdateSize + .pObj = pStable }; int32_t code = sdbUpdateRow(&oper); @@ -966,8 +982,7 @@ static int32_t mgmtAddSuperTableColumn(SDbObj *pDb, SSuperTableObj *pStable, SSc SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsSuperTableSdb, - .pObj = pStable, - .rowSize = tsSuperTableUpdateSize + .pObj = pStable }; int32_t code = sdbUpdateRow(&oper); @@ -1004,8 +1019,7 @@ static int32_t mgmtDropSuperTableColumn(SDbObj *pDb, SSuperTableObj *pStable, ch SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsSuperTableSdb, - .pObj = pStable, - .rowSize = tsSuperTableUpdateSize + .pObj = pStable }; int32_t code = sdbUpdateRow(&oper); @@ -1088,7 +1102,8 @@ int32_t mgmtRetrieveShowSuperTables(SShowObj *pShow, char *data, int32_t rows, v char stableName[TSDB_TABLE_NAME_LEN] = {0}; while (numOfRows < rows) { - pShow->pNode = sdbFetchRow(tsSuperTableSdb, pShow->pNode, (void **) &pTable); + mgmtDecTableRef(pTable); + pShow->pNode = mgmtGetNextSuperTable(pShow->pNode, &pTable); if (pTable == NULL) break; if (strncmp(pTable->info.tableId, prefix, prefixLen)) { continue; @@ -1124,8 +1139,6 @@ int32_t mgmtRetrieveShowSuperTables(SShowObj *pShow, char *data, int32_t rows, v cols++; numOfRows++; - mgmtDecTableRef(pTable); - } pShow->numOfReads += numOfRows; @@ -1144,7 +1157,8 @@ void mgmtDropAllSuperTables(SDbObj *pDropDb) { mPrint("db:%s, all super tables will be dropped from sdb", pDropDb->name); while (1) { - pNode = sdbFetchRow(tsSuperTableSdb, pNode, (void **)&pTable); + pLastNode = pNode; + pNode = mgmtGetNextSuperTable(pNode, &pTable); if (pTable == NULL) break; if (strncmp(pDropDb->name, pTable->info.tableId, dbNameLen) == 0) { @@ -1202,14 +1216,13 @@ static void mgmtGetSuperTableMeta(SQueuedMsg *pMsg) { static void mgmtProcessSuperTableVgroupMsg(SQueuedMsg *pMsg) { SCMSTableVgroupMsg *pInfo = pMsg->pCont; - SSuperTableObj *pTable = mgmtGetSuperTable(pInfo->tableId); - - pMsg->pTable = (STableObj *)pTable; + if (pMsg->pTable == NULL) pMsg->pTable = mgmtGetSuperTable(pInfo->tableId); if (pMsg->pTable == NULL) { mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_INVALID_TABLE); return; } + SSuperTableObj *pTable = (SSuperTableObj *)pMsg->pTable; int32_t contLen = sizeof(SCMSTableVgroupRspMsg) + sizeof(SCMVgroupInfo) * pTable->vgLen; SCMSTableVgroupRspMsg *pRsp = rpcMallocCont(contLen); if (pRsp == NULL) { @@ -1230,8 +1243,8 @@ static void mgmtProcessSuperTableVgroupMsg(SQueuedMsg *pMsg) { SDnodeObj *pDnode = pVgroup->vnodeGid[vn].pDnode; if (pDnode == NULL) break; - pRsp->vgroups[vg].ipAddr[vn].ip = htonl(pDnode->privateIp); - pRsp->vgroups[vg].ipAddr[vn].port = htons(tsDnodeShellPort); + strcpy(pRsp->vgroups[vg].ipAddr[vn].fqdn, pDnode->dnodeFqdn); + pRsp->vgroups[vg].ipAddr[vn].port = htons(pDnode->dnodePort + TSDB_PORT_DNODESHELL); pRsp->vgroups[vg].numOfIps++; } @@ -1419,17 +1432,21 @@ static void mgmtProcessCreateChildTableMsg(SQueuedMsg *pMsg) { } int32_t sid = taosAllocateId(pVgroup->idPool); - if (sid < 0) { - mTrace("tables:%s, no enough sid in vgroup:%d", pVgroup->vgId); + if (sid <= 0) { + mTrace("tables:%s, no enough sid in vgId:%d", pCreate->tableId, pVgroup->vgId); mgmtCreateVgroup(mgmtCloneQueuedMsg(pMsg), pMsg->pDb); return; } if (pMsg->retry == 0) { - pMsg->pTable = (STableObj *)mgmtDoCreateChildTable(pCreate, pVgroup, sid); + if (pMsg->pTable == NULL) { + pMsg->pTable = (STableObj *)mgmtDoCreateChildTable(pCreate, pVgroup, sid); + mgmtIncTableRef(pMsg->pTable); + } } else { - pMsg->pTable = mgmtGetTable(pCreate->tableId); + if (pMsg->pTable == NULL) pMsg->pTable = mgmtGetTable(pCreate->tableId); } + if (pMsg->pTable == NULL) { mgmtSendSimpleResp(pMsg->thandle, terrno); return; @@ -1445,7 +1462,6 @@ static void mgmtProcessCreateChildTableMsg(SQueuedMsg *pMsg) { SQueuedMsg *newMsg = mgmtCloneQueuedMsg(pMsg); newMsg->ahandle = pMsg->pTable; newMsg->maxRetry = 5; - mgmtIncTableRef(pMsg->pTable); SRpcMsg rpcMsg = { .handle = newMsg, .pCont = pMDCreate, @@ -1459,8 +1475,8 @@ static void mgmtProcessCreateChildTableMsg(SQueuedMsg *pMsg) { static void mgmtProcessDropChildTableMsg(SQueuedMsg *pMsg) { SChildTableObj *pTable = (SChildTableObj *)pMsg->pTable; - SVgObj *pVgroup = pMsg->pVgroup = mgmtGetVgroup(pTable->vgId); - if (pVgroup == NULL) { + if (pMsg->pVgroup == NULL) pMsg->pVgroup = mgmtGetVgroup(pTable->vgId); + if (pMsg->pVgroup == NULL) { mError("table:%s, failed to drop ctable, vgroup not exist", pTable->info.tableId); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_OTHERS); return; @@ -1479,7 +1495,7 @@ static void mgmtProcessDropChildTableMsg(SQueuedMsg *pMsg) { pDrop->sid = htonl(pTable->sid); pDrop->uid = htobe64(pTable->uid); - SRpcIpSet ipSet = mgmtGetIpSetFromVgroup(pVgroup); + SRpcIpSet ipSet = mgmtGetIpSetFromVgroup(pMsg->pVgroup); mTrace("table:%s, send drop ctable msg", pDrop->tableId); SQueuedMsg *newMsg = mgmtCloneQueuedMsg(pMsg); @@ -1545,8 +1561,7 @@ static int32_t mgmtAddNormalTableColumn(SDbObj *pDb, SChildTableObj *pTable, SSc SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsChildTableSdb, - .pObj = pTable, - .rowSize = tsChildTableUpdateSize + .pObj = pTable }; int32_t code = sdbUpdateRow(&oper); @@ -1578,8 +1593,7 @@ static int32_t mgmtDropNormalTableColumn(SDbObj *pDb, SChildTableObj *pTable, ch SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsChildTableSdb, - .pObj = pTable, - .rowSize = tsChildTableUpdateSize + .pObj = pTable }; int32_t code = sdbUpdateRow(&oper); @@ -1607,7 +1621,6 @@ static int32_t mgmtSetSchemaFromNormalTable(SSchema *pSchema, SChildTableObj *pT static int32_t mgmtDoGetChildTableMeta(SQueuedMsg *pMsg, STableMetaMsg *pMeta) { SDbObj *pDb = pMsg->pDb; SChildTableObj *pTable = (SChildTableObj *)pMsg->pTable; - int8_t usePublicIp = pMsg->usePublicIp; pMeta->uid = htobe64(pTable->uid); pMeta->sid = htonl(pTable->sid); @@ -1628,68 +1641,57 @@ static int32_t mgmtDoGetChildTableMeta(SQueuedMsg *pMsg, STableMetaMsg *pMeta) { pMeta->contLen = sizeof(STableMetaMsg) + mgmtSetSchemaFromNormalTable(pMeta->schema, pTable); } - SVgObj *pVgroup = pMsg->pVgroup = mgmtGetVgroup(pTable->vgId); - if (pVgroup == NULL) { + if (pMsg->pVgroup == NULL) pMsg->pVgroup = mgmtGetVgroup(pTable->vgId); + if (pMsg->pVgroup == NULL) { mError("table:%s, failed to get table meta, db not selected", pTable->info.tableId); return TSDB_CODE_INVALID_VGROUP_ID; } - for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) { - SDnodeObj *pDnode = mgmtGetDnode(pVgroup->vnodeGid[i].dnodeId); + for (int32_t i = 0; i < pMsg->pVgroup->numOfVnodes; ++i) { + SDnodeObj *pDnode = mgmtGetDnode(pMsg->pVgroup->vnodeGid[i].dnodeId); if (pDnode == NULL) break; - if (usePublicIp) { - pMeta->vgroup.ipAddr[i].ip = htonl(pDnode->publicIp); - pMeta->vgroup.ipAddr[i].port = htonl(tsDnodeShellPort); - } else { - pMeta->vgroup.ipAddr[i].ip = htonl(pDnode->privateIp); - pMeta->vgroup.ipAddr[i].port = htonl(tsDnodeShellPort); - } + strcpy(pMeta->vgroup.ipAddr[i].fqdn, pDnode->dnodeFqdn); + pMeta->vgroup.ipAddr[i].port = htons(pDnode->dnodePort + TSDB_PORT_DNODESHELL); pMeta->vgroup.numOfIps++; mgmtDecDnodeRef(pDnode); } - pMeta->vgroup.vgId = htonl(pVgroup->vgId); + pMeta->vgroup.vgId = htonl(pMsg->pVgroup->vgId); mTrace("table:%s, uid:%" PRIu64 " table meta is retrieved", pTable->info.tableId, pTable->uid); return TSDB_CODE_SUCCESS; } -void mgmtGetChildTableMeta(SQueuedMsg *pMsg) { - SChildTableObj *pTable = (SChildTableObj *)pMsg->pTable; +static void mgmtAutoCreateChildTable(SQueuedMsg *pMsg) { SCMTableInfoMsg *pInfo = pMsg->pCont; - - if (pTable == NULL) { - if (htons(pInfo->createFlag) != 1) { - mError("table:%s, failed to get table meta, table not exist", pInfo->tableId); - mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_INVALID_TABLE); - return; - } else { - //TODO: on demand create table from super table if table does not exists - int32_t contLen = sizeof(SCMCreateTableMsg) + sizeof(STagData); - SCMCreateTableMsg *pCreateMsg = rpcMallocCont(contLen); - if (pCreateMsg == NULL) { - mError("table:%s, failed to create table while get meta info, no enough memory", pInfo->tableId); - mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_SERV_OUT_OF_MEMORY); - return; - } - memcpy(pCreateMsg->schema, pInfo->tags, sizeof(STagData)); - strncpy(pCreateMsg->tableId, pInfo->tableId, tListLen(pInfo->tableId)); - - SQueuedMsg *newMsg = malloc(sizeof(SQueuedMsg)); - memcpy(newMsg, pMsg, sizeof(SQueuedMsg)); - pMsg->pCont = NULL; - - newMsg->ahandle = newMsg->pCont; - newMsg->pCont = pCreateMsg; - mTrace("table:%s, start to create in demand", pInfo->tableId); - mgmtAddToShellQueue(newMsg); - return; - } + int32_t contLen = sizeof(SCMCreateTableMsg) + sizeof(STagData); + SCMCreateTableMsg *pCreateMsg = rpcMallocCont(contLen); + if (pCreateMsg == NULL) { + mError("table:%s, failed to create table while get meta info, no enough memory", pInfo->tableId); + mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_SERV_OUT_OF_MEMORY); + return; } + strncpy(pCreateMsg->tableId, pInfo->tableId, tListLen(pInfo->tableId)); + strcpy(pCreateMsg->db, pMsg->pDb->name); + pCreateMsg->igExists = 1; + pCreateMsg->getMeta = 1; + pCreateMsg->contLen = htonl(contLen); + memcpy(pCreateMsg->schema, pInfo->tags, sizeof(STagData)); + + SQueuedMsg *newMsg = mgmtCloneQueuedMsg(pMsg); + pMsg->pCont = newMsg->pCont; + newMsg->msgType = TSDB_MSG_TYPE_CM_CREATE_TABLE; + newMsg->pCont = pCreateMsg; + + mTrace("table:%s, start to create on demand", pInfo->tableId); + mgmtAddToShellQueue(newMsg); +} + +static void mgmtGetChildTableMeta(SQueuedMsg *pMsg) { STableMetaMsg *pMeta = rpcMallocCont(sizeof(STableMetaMsg) + sizeof(SSchema) * TSDB_MAX_COLUMNS); if (pMeta == NULL) { - mError("table:%s, failed to get table meta, no enough memory", pTable->info.tableId); + mError("table:%s, failed to get table meta, no enough memory", pMsg->pTable->tableId); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_SERV_OUT_OF_MEMORY); return; } @@ -1715,7 +1717,8 @@ void mgmtDropAllChildTables(SDbObj *pDropDb) { mPrint("db:%s, all child tables will be dropped from sdb", pDropDb->name); while (1) { - pNode = sdbFetchRow(tsChildTableSdb, pNode, (void **)&pTable); + pLastNode = pNode; + pNode = mgmtGetNextChildTable(pNode, &pTable); if (pTable == NULL) break; if (strncmp(pDropDb->name, pTable->info.tableId, dbNameLen) == 0) { @@ -1743,7 +1746,8 @@ static void mgmtDropAllChildTablesInStable(SSuperTableObj *pStable) { mPrint("stable:%s, all child tables will dropped from sdb", pStable->info.tableId, numOfTables); while (1) { - pNode = sdbFetchRow(tsChildTableSdb, pNode, (void **)&pTable); + pLastNode = pNode; + pNode = mgmtGetNextChildTable(pNode, &pTable); if (pTable == NULL) break; if (pTable->superTable == pStable) { @@ -1763,16 +1767,13 @@ static void mgmtDropAllChildTablesInStable(SSuperTableObj *pStable) { mPrint("stable:%s, all child tables:%d is dropped from sdb", pStable->info.tableId, numOfTables); } -static SChildTableObj* mgmtGetTableByPos(uint32_t dnodeId, int32_t vnode, int32_t sid) { - SDnodeObj *pObj = mgmtGetDnode(dnodeId); +static SChildTableObj* mgmtGetTableByPos(int32_t vnode, int32_t sid) { SVgObj *pVgroup = mgmtGetVgroup(vnode); + if (pVgroup == NULL) return NULL; - if (pObj == NULL || pVgroup == NULL) { - return NULL; - } - - SChildTableObj *pTable = pVgroup->tableList[sid]; + SChildTableObj *pTable = pVgroup->tableList[sid - 1]; mgmtIncTableRef((STableObj *)pTable); + mgmtDecVgroupRef(pVgroup); return pTable; } @@ -1784,7 +1785,7 @@ static void mgmtProcessTableCfgMsg(SRpcMsg *rpcMsg) { pCfg->sid = htonl(pCfg->sid); mTrace("dnode:%s, vnode:%d, sid:%d, receive table config msg", taosIpStr(pCfg->dnode), pCfg->vnode, pCfg->sid); - SChildTableObj *pTable = mgmtGetTableByPos(pCfg->dnode, pCfg->vnode, pCfg->sid); + SChildTableObj *pTable = mgmtGetTableByPos(pCfg->vnode, pCfg->sid); if (pTable == NULL) { mError("dnode:%s, vnode:%d, sid:%d, table not found", taosIpStr(pCfg->dnode), pCfg->vnode, pCfg->sid); mgmtSendSimpleResp(rpcMsg->handle, TSDB_CODE_NOT_ACTIVE_TABLE); @@ -1800,7 +1801,8 @@ static void mgmtProcessTableCfgMsg(SRpcMsg *rpcMsg) { return; } - SRpcIpSet ipSet = mgmtGetIpSetFromIp(pCfg->dnode); + SDnodeObj *pDnode = mgmtGetDnode(pCfg->dnode); + SRpcIpSet ipSet = mgmtGetIpSetFromIp(pDnode->dnodeEp); SRpcMsg rpcRsp = { .handle = NULL, .pCont = pMDCreate, @@ -1809,7 +1811,9 @@ static void mgmtProcessTableCfgMsg(SRpcMsg *rpcMsg) { .msgType = TSDB_MSG_TYPE_MD_CREATE_TABLE }; mgmtSendMsgToDnode(&ipSet, &rpcRsp); + mgmtDecTableRef(pTable); + mgmtDecDnodeRef(pDnode); } // handle drop child response @@ -1830,8 +1834,8 @@ static void mgmtProcessDropChildTableRsp(SRpcMsg *rpcMsg) { return; } - SVgObj *pVgroup = queueMsg->pVgroup = mgmtGetVgroup(pTable->vgId); - if (pVgroup == NULL) { + if (queueMsg->pVgroup == NULL) queueMsg->pVgroup = mgmtGetVgroup(pTable->vgId); + if (queueMsg->pVgroup == NULL) { mError("table:%s, failed to get vgroup", pTable->info.tableId); mgmtSendSimpleResp(queueMsg->thandle, TSDB_CODE_INVALID_VGROUP_ID); return; @@ -1850,9 +1854,9 @@ static void mgmtProcessDropChildTableRsp(SRpcMsg *rpcMsg) { return; } - if (pVgroup->numOfTables <= 0) { - mPrint("vgroup:%d, all tables is dropped, drop vgroup", pVgroup->vgId); - mgmtDropVgroup(pVgroup, NULL); + if (queueMsg->pVgroup->numOfTables <= 0) { + mPrint("vgId:%d, all tables is dropped, drop vgroup", queueMsg->pVgroup->vgId); + mgmtDropVgroup(queueMsg->pVgroup, NULL); } mgmtSendSimpleResp(queueMsg->thandle, TSDB_CODE_SUCCESS); @@ -1893,9 +1897,10 @@ static void mgmtProcessCreateChildTableRsp(SRpcMsg *rpcMsg) { } else { mTrace("table:%s, created in dnode, thandle:%p result:%s", pTable->info.tableId, queueMsg->thandle, tstrerror(rpcMsg->code)); - - if (queueMsg->msgType != TSDB_MSG_TYPE_CM_CREATE_TABLE) { - mTrace("table:%s, start to get meta", pTable->info.tableId); + SCMCreateTableMsg *pCreate = queueMsg->pCont; + if (pCreate->getMeta) { + mTrace("table:%s, continue to get meta", pTable->info.tableId); + queueMsg->retry = 0; mgmtAddToShellQueue(queueMsg); } else { mgmtSendSimpleResp(queueMsg->thandle, rpcMsg->code); @@ -1928,8 +1933,8 @@ static void mgmtProcessMultiTableMetaMsg(SQueuedMsg *pMsg) { SChildTableObj *pTable = mgmtGetChildTable(tableId); if (pTable == NULL) continue; - SDbObj *pDb = mgmtGetDbByTableId(tableId); - if (pDb == NULL) continue; + if (pMsg->pDb == NULL) pMsg->pDb = mgmtGetDbByTableId(tableId); + if (pMsg->pDb == NULL) continue; int availLen = totalMallocLen - pMultiMeta->contLen; if (availLen <= sizeof(STableMetaMsg) + sizeof(SSchema) * TSDB_MAX_COLUMNS) { @@ -2028,7 +2033,8 @@ static int32_t mgmtRetrieveShowTables(SShowObj *pShow, char *data, int32_t rows, int32_t prefixLen = strlen(prefix); while (numOfRows < rows) { - pShow->pNode = sdbFetchRow(tsChildTableSdb, pShow->pNode, (void **) &pTable); + mgmtDecTableRef(pTable); + pShow->pNode = mgmtGetNextChildTable(pShow->pNode, &pTable); if (pTable == NULL) break; // not belong to current db @@ -2072,7 +2078,6 @@ static int32_t mgmtRetrieveShowTables(SShowObj *pShow, char *data, int32_t rows, cols++; numOfRows++; - mgmtDecTableRef(pTable); } pShow->numOfReads += numOfRows; @@ -2088,7 +2093,7 @@ static void mgmtProcessAlterTableMsg(SQueuedMsg *pMsg) { SCMAlterTableMsg *pAlter = pMsg->pCont; mTrace("table:%s, alter table msg is received from thandle:%p", pAlter->tableId, pMsg->thandle); - pMsg->pDb = mgmtGetDbByTableId(pAlter->tableId); + if (pMsg->pDb == NULL) pMsg->pDb = mgmtGetDbByTableId(pAlter->tableId); if (pMsg->pDb == NULL || pMsg->pDb->status != TSDB_DB_STATUS_READY) { mError("table:%s, failed to alter table, db not selected", pAlter->tableId); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_DB_NOT_SELECTED); @@ -2101,7 +2106,7 @@ static void mgmtProcessAlterTableMsg(SQueuedMsg *pMsg) { return; } - pMsg->pTable = mgmtGetTable(pAlter->tableId); + if (pMsg->pTable == NULL) pMsg->pTable = mgmtGetTable(pAlter->tableId); if (pMsg->pTable == NULL) { mError("table:%s, failed to alter table, table not exist", pMsg->pTable->tableId); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_INVALID_TABLE); diff --git a/src/mnode/src/mgmtUser.c b/src/mnode/src/mgmtUser.c index 708f436d0a..787459d667 100644 --- a/src/mnode/src/mgmtUser.c +++ b/src/mnode/src/mgmtUser.c @@ -168,8 +168,7 @@ static int32_t mgmtUpdateUser(SUserObj *pUser) { SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsUserSdb, - .pObj = pUser, - .rowSize = tsUserUpdateSize + .pObj = pUser }; int32_t code = sdbUpdateRow(&oper); @@ -249,7 +248,7 @@ static int32_t mgmtDropUser(SUserObj *pUser) { } static int32_t mgmtGetUserMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) { - SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL); + SUserObj *pUser = mgmtGetUserFromConn(pConn); if (pUser == NULL) { return TSDB_CODE_NO_USER_FROM_CONN; } @@ -298,7 +297,7 @@ static int32_t mgmtRetrieveUsers(SShowObj *pShow, char *data, int32_t rows, void char *pWrite; while (numOfRows < rows) { - pShow->pNode = sdbFetchRow(tsUserSdb, pShow->pNode, (void **) &pUser); + pShow->pNode = mgmtGetNextUser(pShow->pNode, &pUser); if (pUser == NULL) break; cols = 0; @@ -329,12 +328,9 @@ static int32_t mgmtRetrieveUsers(SShowObj *pShow, char *data, int32_t rows, void return numOfRows; } -SUserObj *mgmtGetUserFromConn(void *pConn, bool *usePublicIp) { +SUserObj *mgmtGetUserFromConn(void *pConn) { SRpcConnInfo connInfo; if (rpcGetConnInfo(pConn, &connInfo) == 0) { - if (usePublicIp) { - *usePublicIp = (connInfo.serverIp == tsPublicIpInt); - } return mgmtGetUser(connInfo.user); } else { mError("can not get user from conn:%p", pConn); @@ -510,7 +506,7 @@ void mgmtDropAllUsers(SAcctObj *pAcct) { while (1) { pLastNode = pNode; - pNode = sdbFetchRow(tsUserSdb, pNode, (void **)&pUser); + pNode = mgmtGetNextUser(pNode, &pUser); if (pUser == NULL) break; if (strncmp(pUser->acct, pAcct->user, acctNameLen) == 0) { diff --git a/src/mnode/src/mgmtVgroup.c b/src/mnode/src/mgmtVgroup.c index 45512b86b3..839dce5c38 100644 --- a/src/mnode/src/mgmtVgroup.c +++ b/src/mnode/src/mgmtVgroup.c @@ -36,8 +36,8 @@ #include "mgmtTable.h" #include "mgmtVgroup.h" -void *tsVgroupSdb = NULL; -int32_t tsVgUpdateSize = 0; +static void *tsVgroupSdb = NULL; +static int32_t tsVgUpdateSize = 0; static int32_t mgmtGetVgroupMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn); static int32_t mgmtRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, void *pConn); @@ -62,6 +62,8 @@ static int32_t mgmtVgroupActionDestroy(SSdbOper *pOper) { static int32_t mgmtVgroupActionInsert(SSdbOper *pOper) { SVgObj *pVgroup = pOper->pObj; + + // refer to db SDbObj *pDb = mgmtGetDb(pVgroup->dbName); if (pDb == NULL) { return TSDB_CODE_INVALID_DB; @@ -74,13 +76,13 @@ static int32_t mgmtVgroupActionInsert(SSdbOper *pOper) { int32_t size = sizeof(SChildTableObj *) * pDb->cfg.maxTables; pVgroup->tableList = calloc(pDb->cfg.maxTables, sizeof(SChildTableObj *)); if (pVgroup->tableList == NULL) { - mError("vgroup:%d, failed to malloc(size:%d) for the tableList of vgroups", pVgroup->vgId, size); + mError("vgId:%d, failed to malloc(size:%d) for the tableList of vgroups", pVgroup->vgId, size); return -1; } pVgroup->idPool = taosInitIdPool(pDb->cfg.maxTables); if (pVgroup->idPool == NULL) { - mError("vgroup:%d, failed to taosInitIdPool for vgroups", pVgroup->vgId); + mError("vgId:%d, failed to taosInitIdPool for vgroups", pVgroup->vgId); tfree(pVgroup->tableList); return -1; } @@ -101,7 +103,7 @@ static int32_t mgmtVgroupActionInsert(SSdbOper *pOper) { static int32_t mgmtVgroupActionDelete(SSdbOper *pOper) { SVgObj *pVgroup = pOper->pObj; - + if (pVgroup->pDb != NULL) { mgmtRemoveVgroupFromDb(pVgroup); } @@ -140,6 +142,7 @@ static int32_t mgmtVgroupActionUpdate(SSdbOper *pOper) { if (pDnode != NULL) { atomic_add_fetch_32(&pDnode->openVnodes, 1); } + mgmtDecDnodeRef(pDnode); } } @@ -147,14 +150,15 @@ static int32_t mgmtVgroupActionUpdate(SSdbOper *pOper) { SDbObj *pDb = pVgroup->pDb; if (pDb != NULL) { if (pDb->cfg.maxTables != oldTables) { - mPrint("vgroup:%d tables change from %d to %d", pVgroup->vgId, oldTables, pDb->cfg.maxTables); + mPrint("vgId:%d tables change from %d to %d", pVgroup->vgId, oldTables, pDb->cfg.maxTables); taosUpdateIdPool(pVgroup->idPool, pDb->cfg.maxTables); int32_t size = sizeof(SChildTableObj *) * pDb->cfg.maxTables; pVgroup->tableList = (SChildTableObj **)realloc(pVgroup->tableList, size); } } - mTrace("vgroup:%d, is updated, tables:%d numOfVnode:%d", pVgroup->vgId, pDb->cfg.maxTables, pVgroup->numOfVnodes); + mgmtDecVgroupRef(pVgroup); + mTrace("vgId:%d, is updated, tables:%d numOfVnode:%d", pVgroup->vgId, pDb->cfg.maxTables, pVgroup->numOfVnodes); return TSDB_CODE_SUCCESS; } @@ -162,7 +166,7 @@ static int32_t mgmtVgroupActionEncode(SSdbOper *pOper) { SVgObj *pVgroup = pOper->pObj; memcpy(pOper->rowData, pVgroup, tsVgUpdateSize); SVgObj *pTmpVgroup = pOper->rowData; - for (int32_t i = 0; i < TSDB_VNODES_SUPPORT; ++i) { + for (int32_t i = 0; i < TSDB_MAX_REPLICA; ++i) { pTmpVgroup->vnodeGid[i].pDnode = NULL; pTmpVgroup->vnodeGid[i].role = 0; } @@ -237,8 +241,7 @@ void mgmtUpdateVgroup(SVgObj *pVgroup) { SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsVgroupSdb, - .pObj = pVgroup, - .rowSize = tsVgUpdateSize + .pObj = pVgroup }; sdbUpdateRow(&oper); @@ -260,8 +263,8 @@ void mgmtUpdateVgroupStatus(SVgObj *pVgroup, SDnodeObj *pDnode, SVnodeLoad *pVlo } if (!dnodeExist) { - SRpcIpSet ipSet = mgmtGetIpSetFromIp(pDnode->privateIp); - mError("vgroup:%d, dnode:%d not exist in mnode, drop it", pVload->vgId, pDnode->dnodeId); + SRpcIpSet ipSet = mgmtGetIpSetFromIp(pDnode->dnodeEp); + mError("vgId:%d, dnode:%d not exist in mnode, drop it", pVload->vgId, pDnode->dnodeId); mgmtSendDropVnodeMsg(pVload->vgId, &ipSet, NULL); return; } @@ -273,7 +276,7 @@ void mgmtUpdateVgroupStatus(SVgObj *pVgroup, SDnodeObj *pDnode, SVnodeLoad *pVlo } if (pVload->cfgVersion != pVgroup->pDb->cfgVersion || pVload->replica != pVgroup->numOfVnodes) { - mError("dnode:%d, vgroup:%d, vnode cfgVersion:%d repica:%d not match with mgmt cfgVersion:%d replica:%d", + mError("dnode:%d, vgId:%d, vnode cfgVersion:%d repica:%d not match with mgmt cfgVersion:%d replica:%d", pDnode->dnodeId, pVload->vgId, pVload->cfgVersion, pVload->replica, pVgroup->pDb->cfgVersion, pVgroup->numOfVnodes); mgmtSendCreateVgroupMsg(pVgroup, NULL); @@ -317,9 +320,9 @@ void mgmtCreateVgroup(SQueuedMsg *pMsg, SDbObj *pDb) { return; } - mPrint("vgroup:%d, is created in mnode, db:%s replica:%d", pVgroup->vgId, pDb->name, pVgroup->numOfVnodes); + mPrint("vgId:%d, is created in mnode, db:%s replica:%d", pVgroup->vgId, pDb->name, pVgroup->numOfVnodes); for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) { - mPrint("vgroup:%d, index:%d, dnode:%d", pVgroup->vgId, i, pVgroup->vnodeGid[i].dnodeId); + mPrint("vgId:%d, index:%d, dnode:%d", pVgroup->vgId, i, pVgroup->vnodeGid[i].dnodeId); } pMsg->ahandle = pVgroup; @@ -331,7 +334,7 @@ void mgmtDropVgroup(SVgObj *pVgroup, void *ahandle) { if (ahandle != NULL) { mgmtSendDropVgroupMsg(pVgroup, ahandle); } else { - mTrace("vgroup:%d, replica:%d is deleting from sdb", pVgroup->vgId, pVgroup->numOfVnodes); + mTrace("vgId:%d, replica:%d is deleting from sdb", pVgroup->vgId, pVgroup->numOfVnodes); mgmtSendDropVgroupMsg(pVgroup, NULL); SSdbOper oper = { .type = SDB_OPER_GLOBAL, @@ -379,6 +382,7 @@ int32_t mgmtGetVgroupMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) { if (pShow->payloadLen > 0 ) { pTable = mgmtGetTable(pShow->payload); if (NULL == pTable || pTable->type == TSDB_SUPER_TABLE) { + mgmtDecTableRef(pTable); return TSDB_CODE_INVALID_TABLE_ID; } mgmtDecTableRef(pTable); @@ -401,9 +405,9 @@ int32_t mgmtGetVgroupMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) { pSchema[cols].bytes = htons(pShow->bytes[cols]); cols++; - pShow->bytes[cols] = 16; + pShow->bytes[cols] = 40; pSchema[cols].type = TSDB_DATA_TYPE_BINARY; - strcpy(pSchema[cols].name, "ip"); + strcpy(pSchema[cols].name, "end point"); pSchema[cols].bytes = htons(pShow->bytes[cols]); cols++; @@ -440,7 +444,6 @@ int32_t mgmtRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, void *pCo SVgObj *pVgroup = NULL; int32_t maxReplica = 0; int32_t cols = 0; - char ipstr[20]; char * pWrite; SDbObj *pDb = mgmtGetDb(pShow->db); @@ -479,10 +482,10 @@ int32_t mgmtRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, void *pCo SDnodeObj *pDnode = pVgroup->vnodeGid[i].pDnode; if (pDnode != NULL) { - tinet_ntoa(ipstr, pDnode->privateIp); pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; - strcpy(pWrite, ipstr); + strncpy(pWrite, pDnode->dnodeEp, pShow->bytes[cols]-1); cols++; + pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; strcpy(pWrite, mgmtGetMnodeRoleStr(pVgroup->vnodeGid[i].role)); cols++; @@ -506,25 +509,28 @@ int32_t mgmtRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, void *pCo } void mgmtAddTableIntoVgroup(SVgObj *pVgroup, SChildTableObj *pTable) { - if (pTable->sid >= 0 && pVgroup->tableList[pTable->sid] == NULL) { - pVgroup->tableList[pTable->sid] = pTable; + if (pTable->sid >= 1 && pVgroup->tableList[pTable->sid - 1] == NULL) { + pVgroup->tableList[pTable->sid - 1] = pTable; taosIdPoolMarkStatus(pVgroup->idPool, pTable->sid); pVgroup->numOfTables++; } - if (pVgroup->numOfTables >= pVgroup->pDb->cfg.maxTables) - mgmtAddVgroupIntoDbTail(pVgroup); + if (pVgroup->numOfTables >= pVgroup->pDb->cfg.maxTables) { + mgmtMoveVgroupToTail(pVgroup); + } + + mgmtIncVgroupRef(pVgroup); } void mgmtRemoveTableFromVgroup(SVgObj *pVgroup, SChildTableObj *pTable) { - if (pTable->sid >= 0 && pVgroup->tableList[pTable->sid] != NULL) { - pVgroup->tableList[pTable->sid] = NULL; + if (pTable->sid >= 1 && pVgroup->tableList[pTable->sid - 1] != NULL) { + pVgroup->tableList[pTable->sid - 1] = NULL; taosFreeId(pVgroup->idPool, pTable->sid); pVgroup->numOfTables--; } - if (pVgroup->numOfTables >= pVgroup->pDb->cfg.maxTables) - mgmtAddVgroupIntoDbTail(pVgroup); + mgmtMoveVgroupToHead(pVgroup); + mgmtDecVgroupRef(pVgroup); } SMDCreateVnodeMsg *mgmtBuildCreateVnodeMsg(SVgObj *pVgroup) { @@ -559,11 +565,7 @@ SMDCreateVnodeMsg *mgmtBuildCreateVnodeMsg(SVgObj *pVgroup) { SDnodeObj *pDnode = pVgroup->vnodeGid[j].pDnode; if (pDnode != NULL) { pNodes[j].nodeId = htonl(pDnode->dnodeId); - pNodes[j].nodeIp = htonl(pDnode->privateIp); - strcpy(pNodes[j].nodeName, pDnode->dnodeName); - if (j == 0) { - pCfg->arbitratorIp = htonl(pDnode->privateIp); - } + strcpy(pNodes[j].nodeEp, pDnode->dnodeEp); } } @@ -574,26 +576,26 @@ SRpcIpSet mgmtGetIpSetFromVgroup(SVgObj *pVgroup) { SRpcIpSet ipSet = { .numOfIps = pVgroup->numOfVnodes, .inUse = 0, - .port = tsDnodeMnodePort }; for (int i = 0; i < pVgroup->numOfVnodes; ++i) { - ipSet.ip[i] = pVgroup->vnodeGid[i].pDnode->privateIp; + strcpy(ipSet.fqdn[i], pVgroup->vnodeGid[i].pDnode->dnodeFqdn); + ipSet.port[i] = pVgroup->vnodeGid[i].pDnode->dnodePort + TSDB_PORT_DNODEMNODE; } return ipSet; } -SRpcIpSet mgmtGetIpSetFromIp(uint32_t ip) { - SRpcIpSet ipSet = { - .ip[0] = ip, - .numOfIps = 1, - .inUse = 0, - .port = tsDnodeMnodePort - }; +SRpcIpSet mgmtGetIpSetFromIp(char *ep) { + SRpcIpSet ipSet; + + ipSet.numOfIps = 1; + ipSet.inUse = 0; + taosGetFqdnPortFromEp(ep, ipSet.fqdn[0], &ipSet.port[0]); + ipSet.port[0] += TSDB_PORT_DNODEMNODE; return ipSet; } void mgmtSendCreateVnodeMsg(SVgObj *pVgroup, SRpcIpSet *ipSet, void *ahandle) { - mTrace("vgroup:%d, send create vnode:%d msg, ahandle:%p", pVgroup->vgId, pVgroup->vgId, ahandle); + mTrace("vgId:%d, send create vnode:%d msg, ahandle:%p", pVgroup->vgId, pVgroup->vgId, ahandle); SMDCreateVnodeMsg *pCreate = mgmtBuildCreateVnodeMsg(pVgroup); SRpcMsg rpcMsg = { .handle = ahandle, @@ -606,9 +608,9 @@ void mgmtSendCreateVnodeMsg(SVgObj *pVgroup, SRpcIpSet *ipSet, void *ahandle) { } void mgmtSendCreateVgroupMsg(SVgObj *pVgroup, void *ahandle) { - mTrace("vgroup:%d, send create all vnodes msg, ahandle:%p", pVgroup->vgId, ahandle); + mTrace("vgId:%d, send create all vnodes msg, ahandle:%p", pVgroup->vgId, ahandle); for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) { - SRpcIpSet ipSet = mgmtGetIpSetFromIp(pVgroup->vnodeGid[i].pDnode->privateIp); + SRpcIpSet ipSet = mgmtGetIpSetFromIp(pVgroup->vnodeGid[i].pDnode->dnodeEp); mgmtSendCreateVnodeMsg(pVgroup, &ipSet, ahandle); } } @@ -624,7 +626,7 @@ static void mgmtProcessCreateVnodeRsp(SRpcMsg *rpcMsg) { } SVgObj *pVgroup = queueMsg->ahandle; - mTrace("vgroup:%d, create vnode rsp received, result:%s received:%d successed:%d expected:%d, thandle:%p ahandle:%p", + mTrace("vgId:%d, create vnode rsp received, result:%s received:%d successed:%d expected:%d, thandle:%p ahandle:%p", pVgroup->vgId, tstrerror(rpcMsg->code), queueMsg->received, queueMsg->successed, queueMsg->expected, queueMsg->thandle, rpcMsg->handle); @@ -659,7 +661,7 @@ static SMDDropVnodeMsg *mgmtBuildDropVnodeMsg(int32_t vgId) { } void mgmtSendDropVnodeMsg(int32_t vgId, SRpcIpSet *ipSet, void *ahandle) { - mTrace("vgroup:%d, send drop vnode msg, ahandle:%p", vgId, ahandle); + mTrace("vgId:%d, send drop vnode msg, ahandle:%p", vgId, ahandle); SMDDropVnodeMsg *pDrop = mgmtBuildDropVnodeMsg(vgId); SRpcMsg rpcMsg = { .handle = ahandle, @@ -672,15 +674,15 @@ void mgmtSendDropVnodeMsg(int32_t vgId, SRpcIpSet *ipSet, void *ahandle) { } static void mgmtSendDropVgroupMsg(SVgObj *pVgroup, void *ahandle) { - mTrace("vgroup:%d, send drop all vnodes msg, ahandle:%p", pVgroup->vgId, ahandle); + mTrace("vgId:%d, send drop all vnodes msg, ahandle:%p", pVgroup->vgId, ahandle); for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) { - SRpcIpSet ipSet = mgmtGetIpSetFromIp(pVgroup->vnodeGid[i].pDnode->privateIp); + SRpcIpSet ipSet = mgmtGetIpSetFromIp(pVgroup->vnodeGid[i].pDnode->dnodeEp); mgmtSendDropVnodeMsg(pVgroup->vgId, &ipSet, ahandle); } } static void mgmtProcessDropVnodeRsp(SRpcMsg *rpcMsg) { - mTrace("drop vnode rsp is received"); + mTrace("drop vnode rsp is received, handle:%p", rpcMsg->handle); if (rpcMsg->handle == NULL) return; SQueuedMsg *queueMsg = rpcMsg->handle; @@ -691,7 +693,7 @@ static void mgmtProcessDropVnodeRsp(SRpcMsg *rpcMsg) { } SVgObj *pVgroup = queueMsg->ahandle; - mTrace("vgroup:%d, drop vnode rsp received, result:%s received:%d successed:%d expected:%d, thandle:%p ahandle:%p", + mTrace("vgId:%d, drop vnode rsp received, result:%s received:%d successed:%d expected:%d, thandle:%p ahandle:%p", pVgroup->vgId, tstrerror(rpcMsg->code), queueMsg->received, queueMsg->successed, queueMsg->expected, queueMsg->thandle, rpcMsg->handle); @@ -737,24 +739,22 @@ static void mgmtProcessVnodeCfgMsg(SRpcMsg *rpcMsg) { mgmtSendSimpleResp(rpcMsg->handle, TSDB_CODE_SUCCESS); - SRpcIpSet ipSet = mgmtGetIpSetFromIp(pDnode->privateIp); + SRpcIpSet ipSet = mgmtGetIpSetFromIp(pDnode->dnodeEp); mgmtSendCreateVnodeMsg(pVgroup, &ipSet, NULL); } -void mgmtDropAllVgroups(SDbObj *pDropDb) { - void *pNode = NULL; - void *pLastNode = NULL; - int32_t numOfVgroups = 0; - int32_t dbNameLen = strlen(pDropDb->name); +void mgmtDropAllDnodeVgroups(SDnodeObj *pDropDnode) { + void * pNode = NULL; + void * pLastNode = NULL; SVgObj *pVgroup = NULL; - - mPrint("db:%s, all vgroups will be dropped from sdb", pDropDb->name); + int32_t numOfVgroups = 0; while (1) { - pNode = sdbFetchRow(tsVgroupSdb, pNode, (void **)&pVgroup); + pLastNode = pNode; + pNode = mgmtGetNextVgroup(pNode, &pVgroup); if (pVgroup == NULL) break; - if (strncmp(pDropDb->name, pVgroup->dbName, dbNameLen) == 0) { + if (pVgroup->vnodeGid[0].dnodeId == pDropDnode->dnodeId) { SSdbOper oper = { .type = SDB_OPER_LOCAL, .table = tsVgroupSdb, @@ -763,9 +763,36 @@ void mgmtDropAllVgroups(SDbObj *pDropDb) { sdbDeleteRow(&oper); pNode = pLastNode; numOfVgroups++; + continue; + } + mgmtDecVgroupRef(pVgroup); + } +} + +void mgmtDropAllDbVgroups(SDbObj *pDropDb) { + void *pNode = NULL; + void *pLastNode = NULL; + int32_t numOfVgroups = 0; + SVgObj *pVgroup = NULL; + + mPrint("db:%s, all vgroups will be dropped from sdb", pDropDb->name); + while (1) { + pLastNode = pNode; + pNode = mgmtGetNextVgroup(pNode, &pVgroup); + if (pVgroup == NULL) break; + + if (pVgroup->pDb == pDropDb) { + SSdbOper oper = { + .type = SDB_OPER_LOCAL, + .table = tsVgroupSdb, + .pObj = pVgroup, + }; + sdbDeleteRow(&oper); + pNode = pLastNode; + numOfVgroups++; + mgmtSendDropVgroupMsg(pVgroup, NULL); } - mgmtSendDropVgroupMsg(pVgroup, NULL); mgmtDecVgroupRef(pVgroup); } diff --git a/src/os/darwin/src/darwinEnv.c b/src/os/darwin/src/darwinEnv.c index d9152e673d..27d5a7c99b 100644 --- a/src/os/darwin/src/darwinEnv.c +++ b/src/os/darwin/src/darwinEnv.c @@ -23,8 +23,8 @@ void osInit() { strcpy(tsVnodeDir, ""); strcpy(tsDnodeDir, ""); strcpy(tsMnodeDir, ""); - strcpy(dataDir, "/var/lib/taos"); - strcpy(logDir, "~/TDengineLog"); - strcpy(scriptDir, "/etc/taos"); - strcpy(osName, "Darwin"); + strcpy(tsDataDir, "/var/lib/taos"); + strcpy(tsLogDir, "~/TDengineLog"); + strcpy(tsScriptDir, "/etc/taos"); + strcpy(tsOsName, "Darwin"); } diff --git a/src/os/darwin/src/darwinPlatform.c b/src/os/darwin/src/darwinPlatform.c index 5ee7889af4..05290c43f4 100644 --- a/src/os/darwin/src/darwinPlatform.c +++ b/src/os/darwin/src/darwinPlatform.c @@ -151,67 +151,6 @@ int taosSetSockOpt(int socketfd, int level, int optname, void *optval, int optle return setsockopt(socketfd, level, optname, optval, (socklen_t)optlen); } -int taosOpenUDClientSocket(char *ip, uint16_t port) { - int sockFd = 0; - struct sockaddr_un serverAddr; - int ret; - char name[128]; - sprintf(name, "%s.%hu", ip, port); - - sockFd = socket(AF_UNIX, SOCK_STREAM, 0); - - if (sockFd < 0) { - uError("failed to open the UD socket:%s, reason:%s", name, strerror(errno)); - return -1; - } - - memset((char *)&serverAddr, 0, sizeof(serverAddr)); - serverAddr.sun_family = AF_UNIX; - strcpy(serverAddr.sun_path + 1, name); - - ret = connect(sockFd, (struct sockaddr *)&serverAddr, sizeof(serverAddr)); - - if (ret != 0) { - uError("failed to connect UD socket, name:%d, reason: %s", name, strerror(errno)); - sockFd = -1; - } - - return sockFd; -} - -int taosOpenUDServerSocket(char *ip, uint16_t port) { - struct sockaddr_un serverAdd; - int sockFd; - char name[128]; - - uTrace("open ud socket:%s", name); - sprintf(name, "%s.%hu", ip, port); - - bzero((char *)&serverAdd, sizeof(serverAdd)); - serverAdd.sun_family = AF_UNIX; - strcpy(serverAdd.sun_path + 1, name); - unlink(name); - - if ((sockFd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { - uError("failed to open UD socket:%s, reason:%s", name, strerror(errno)); - return -1; - } - - /* bind socket to server address */ - if (bind(sockFd, (struct sockaddr *)&serverAdd, sizeof(serverAdd)) < 0) { - uError("bind socket:%s failed, reason:%s", name, strerror(errno)); - tclose(sockFd); - return -1; - } - - if (listen(sockFd, 10) < 0) { - uError("listen socket:%s failed, reason:%s", name, strerror(errno)); - return -1; - } - - return sockFd; -} - int taosInitTimer(void (*callback)(int), int ms) { signal(SIGALRM, callback); @@ -443,4 +382,4 @@ int fsendfile(FILE* out_file, FILE* in_file, int64_t* offset, int32_t count) { return writeLen; } -void taosSetCoreDump() {} \ No newline at end of file +void taosSetCoreDump() {} diff --git a/src/os/linux/src/linuxEnv.c b/src/os/linux/src/linuxEnv.c index bc1a309c9e..0a9d81311a 100644 --- a/src/os/linux/src/linuxEnv.c +++ b/src/os/linux/src/linuxEnv.c @@ -23,8 +23,8 @@ void osInit() { strcpy(tsVnodeDir, ""); strcpy(tsDnodeDir, ""); strcpy(tsMnodeDir, ""); - strcpy(dataDir, "/var/lib/taos"); - strcpy(logDir, "/var/log/taos"); - strcpy(scriptDir, "/etc/taos"); - strcpy(osName, "Linux"); + strcpy(tsDataDir, "/var/lib/taos"); + strcpy(tsLogDir, "/var/log/taos"); + strcpy(tsScriptDir, "/etc/taos"); + strcpy(tsOsName, "Linux"); } \ No newline at end of file diff --git a/src/os/linux/src/linuxPlatform.c b/src/os/linux/src/linuxPlatform.c index d9d56a2239..72da97287f 100644 --- a/src/os/linux/src/linuxPlatform.c +++ b/src/os/linux/src/linuxPlatform.c @@ -143,68 +143,6 @@ int taosSetNonblocking(int sock, int on) { int taosSetSockOpt(int socketfd, int level, int optname, void *optval, int optlen) { return setsockopt(socketfd, level, optname, optval, (socklen_t)optlen); } - -int taosOpenUDClientSocket(char *ip, uint16_t port) { - int sockFd = 0; - struct sockaddr_un serverAddr; - int ret; - char name[128]; - sprintf(name, "%s.%hu", ip, port); - - sockFd = socket(AF_UNIX, SOCK_STREAM, 0); - - if (sockFd < 0) { - uError("failed to open the UD socket:%s, reason:%s", name, strerror(errno)); - return -1; - } - - memset((char *)&serverAddr, 0, sizeof(serverAddr)); - serverAddr.sun_family = AF_UNIX; - strcpy(serverAddr.sun_path + 1, name); - - ret = connect(sockFd, (struct sockaddr *)&serverAddr, sizeof(serverAddr)); - - if (ret != 0) { - uError("failed to connect UD socket, name:%d, reason: %s", name, strerror(errno)); - sockFd = -1; - } - - return sockFd; -} - -int taosOpenUDServerSocket(char *ip, uint16_t port) { - struct sockaddr_un serverAdd; - int sockFd; - char name[128]; - - uTrace("open ud socket:%s", name); - sprintf(name, "%s.%hu", ip, port); - - bzero((char *)&serverAdd, sizeof(serverAdd)); - serverAdd.sun_family = AF_UNIX; - strcpy(serverAdd.sun_path + 1, name); - unlink(name); - - if ((sockFd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { - uError("failed to open UD socket:%s, reason:%s", name, strerror(errno)); - return -1; - } - - /* bind socket to server address */ - if (bind(sockFd, (struct sockaddr *)&serverAdd, sizeof(serverAdd)) < 0) { - uError("bind socket:%s failed, reason:%s", name, strerror(errno)); - tclose(sockFd); - return -1; - } - - if (listen(sockFd, 10) < 0) { - uError("listen socket:%s failed, reason:%s", name, strerror(errno)); - return -1; - } - - return sockFd; -} - static void taosDeleteTimer(void *tharg) { timer_t *pTimer = tharg; timer_delete(*pTimer); diff --git a/src/os/linux/src/linuxSysPara.c b/src/os/linux/src/linuxSysPara.c index 54e24c28e5..98d80ded5d 100644 --- a/src/os/linux/src/linuxSysPara.c +++ b/src/os/linux/src/linuxSysPara.c @@ -290,11 +290,12 @@ bool taosGetCpuUsage(float *sysCpuUsage, float *procCpuUsage) { bool taosGetDisk() { struct statvfs info; const double unit = 1024 * 1024 * 1024; - + if (tscEmbedded) { - if (statvfs(dataDir, &info)) { - tsTotalDataDirGB = 0; - tsAvailDataDirGB = 0; + if (statvfs(tsDataDir, &info)) { + //tsTotalDataDirGB = 0; + //tsAvailDataDirGB = 0; + uError("failed to get disk size, dataDir:%s errno:%s", tsDataDir, strerror(errno)); return false; } else { tsTotalDataDirGB = (float)((double)info.f_blocks * (double)info.f_frsize / unit); @@ -302,9 +303,10 @@ bool taosGetDisk() { } } - if (statvfs(logDir, &info)) { - tsTotalLogDirGB = 0; - tsAvailLogDirGB = 0; + if (statvfs(tsLogDir, &info)) { + //tsTotalLogDirGB = 0; + //tsAvailLogDirGB = 0; + uError("failed to get disk size, logDir:%s errno:%s", tsLogDir, strerror(errno)); return false; } else { tsTotalLogDirGB = (float)((double)info.f_blocks * (double)info.f_frsize / unit); @@ -312,8 +314,9 @@ bool taosGetDisk() { } if (statvfs("/tmp", &info)) { - tsTotalTmpDirGB = 0; - tsAvailTmpDirGB = 0; + //tsTotalTmpDirGB = 0; + //tsAvailTmpDirGB = 0; + uError("failed to get disk size, tmpDir:/tmp errno:%s", strerror(errno)); return false; } else { tsTotalTmpDirGB = (float)((double)info.f_blocks * (double)info.f_frsize / unit); @@ -361,6 +364,8 @@ static bool taosGetCardName(char *ip, char *name) { static bool taosGetCardInfo(int64_t *bytes) { static char tsPublicCard[1000] = {0}; + static char tsPrivateIp[40]; + if (tsPublicCard[0] == 0) { if (!taosGetCardName(tsPrivateIp, tsPublicCard)) { uError("can't get card name from ip:%s", tsPrivateIp); diff --git a/src/os/windows/src/twinenv.c b/src/os/windows/src/twinenv.c index 2b18acdaab..840a8d9f7a 100644 --- a/src/os/windows/src/twinenv.c +++ b/src/os/windows/src/twinenv.c @@ -23,8 +23,8 @@ void osInit() { strcpy(tsVnodeDir, "C:/TDengine/data"); strcpy(tsDnodeDir, ""); strcpy(tsMnodeDir, ""); - strcpy(dataDir, "C:/TDengine/data"); - strcpy(logDir, "C:/TDengine/log"); - strcpy(scriptDir, "C:/TDengine/script"); - strcpy(osName, "Windows"); + strcpy(tsDataDir, "C:/TDengine/data"); + strcpy(tsLogDir, "C:/TDengine/log"); + strcpy(tsScriptDir, "C:/TDengine/script"); + strcpy(tsOsName, "Windows"); } \ No newline at end of file diff --git a/src/plugins/http/inc/httpHandle.h b/src/plugins/http/inc/httpHandle.h index a62dabc800..d8b3b8eade 100644 --- a/src/plugins/http/inc/httpHandle.h +++ b/src/plugins/http/inc/httpHandle.h @@ -210,7 +210,7 @@ typedef struct HttpThread { typedef struct HttpServer { char label[HTTP_LABEL_SIZE]; - char serverIp[16]; + uint32_t serverIp; uint16_t serverPort; int cacheContext; int sessionExpire; diff --git a/src/plugins/http/src/httpSystem.c b/src/plugins/http/src/httpSystem.c index 355fdf2fd0..89dc11796f 100644 --- a/src/plugins/http/src/httpSystem.c +++ b/src/plugins/http/src/httpSystem.c @@ -48,7 +48,7 @@ int httpInitSystem() { memset(httpServer, 0, sizeof(HttpServer)); strcpy(httpServer->label, "rest"); - strcpy(httpServer->serverIp, tsHttpIp); + httpServer->serverIp = 0; httpServer->serverPort = tsHttpPort; httpServer->cacheContext = tsHttpCacheSessions; httpServer->sessionExpire = tsHttpSessionExpire; @@ -117,7 +117,7 @@ void httpCleanUpSystem() { httpPrint("http service cleanup"); httpStopSystem(); -#if 1 +#if 0 if (httpServer == NULL) { return; } diff --git a/src/plugins/monitor/src/monitorMain.c b/src/plugins/monitor/src/monitorMain.c index dade813d9c..a4f9f32050 100644 --- a/src/plugins/monitor/src/monitorMain.c +++ b/src/plugins/monitor/src/monitorMain.c @@ -68,7 +68,7 @@ typedef enum { typedef struct { void * conn; void * timer; - char privateIpStr[TSDB_IPv4ADDR_LEN]; + char ep[TSDB_FQDN_LEN]; int8_t cmdIndex; int8_t state; char sql[SQL_LENGTH]; @@ -112,14 +112,8 @@ static void monitorInitConn(void *para, void *unused) { monitorPrint("starting to initialize monitor service .."); tsMonitorConn.state = MONITOR_STATE_INITIALIZING; - if (tsMonitorConn.privateIpStr[0] == 0) { - strcpy(tsMonitorConn.privateIpStr, tsPrivateIp); - for (int32_t i = 0; i < TSDB_IPv4ADDR_LEN; ++i) { - if (tsMonitorConn.privateIpStr[i] == '.') { - tsMonitorConn.privateIpStr[i] = '_'; - } - } - } + if (tsMonitorConn.ep[0] == 0) + strcpy(tsMonitorConn.ep, tsLocalEp); if (tsMonitorConn.conn == NULL) { taos_connect_a(NULL, "monitor", tsInternalPass, "", 0, monitorInitConnCb, &tsMonitorConn, &(tsMonitorConn.conn)); @@ -163,7 +157,7 @@ static void dnodeBuildMonitorSql(char *sql, int32_t cmd) { tsMonitorDbName, IP_LEN_STR + 1); } else if (cmd == MONITOR_CMD_CREATE_TB_DN) { snprintf(sql, SQL_LENGTH, "create table if not exists %s.dn_%s using %s.dn tags('%s')", tsMonitorDbName, - tsMonitorConn.privateIpStr, tsMonitorDbName, tsPrivateIp); + tsMonitorConn.ep, tsMonitorDbName, tsLocalEp); } else if (cmd == MONITOR_CMD_CREATE_MT_ACCT) { snprintf(sql, SQL_LENGTH, "create table if not exists %s.acct(ts timestamp " @@ -214,7 +208,7 @@ static void monitorInitDatabaseCb(void *param, TAOS_RES *result, int32_t code) { if (-code == TSDB_CODE_TABLE_ALREADY_EXIST || -code == TSDB_CODE_DB_ALREADY_EXIST || code >= 0) { monitorTrace("monitor:%p, sql success, reason:%d, %s", tsMonitorConn.conn, tstrerror(code), tsMonitorConn.sql); if (tsMonitorConn.cmdIndex == MONITOR_CMD_CREATE_TB_LOG) { - monitorPrint("dnode:%s is started", tsPrivateIp); + monitorPrint("dnode:%s is started", tsLocalEp); } tsMonitorConn.cmdIndex++; monitorInitDatabase(); @@ -346,7 +340,7 @@ static void monitorSaveSystemInfo() { int64_t ts = taosGetTimestampUs(); char * sql = tsMonitorConn.sql; - int32_t pos = snprintf(sql, SQL_LENGTH, "insert into %s.dn_%s values(%" PRId64, tsMonitorDbName, tsMonitorConn.privateIpStr, ts); + int32_t pos = snprintf(sql, SQL_LENGTH, "insert into %s.dn_%s values(%" PRId64, tsMonitorDbName, tsMonitorConn.ep, ts); pos += monitorBuildCpuSql(sql + pos); pos += monitorBuildMemorySql(sql + pos); @@ -414,7 +408,7 @@ void monitorSaveLog(int32_t level, const char *const format, ...) { va_end(argpointer); if (len > max_length) len = max_length; - len += sprintf(sql + len, "', '%s')", tsPrivateIp); + len += sprintf(sql + len, "', '%s')", tsLocalEp); sql[len++] = 0; monitorTrace("monitor:%p, save log, sql: %s", tsMonitorConn.conn, sql); diff --git a/src/query/src/sql.c b/src/query/src/sql.c index d52e58395a..08a8d41c69 100644 --- a/src/query/src/sql.c +++ b/src/query/src/sql.c @@ -27,7 +27,6 @@ #include #include -#include #include #include #include "qsqlparser.h" @@ -203,61 +202,62 @@ typedef union { ** yy_default[] Default action for each state. ** *********** Begin parsing tables **********************************************/ -#define YY_ACTTAB_COUNT (529) +#define YY_ACTTAB_COUNT (531) static const YYACTIONTYPE yy_action[] = { - /* 0 */ 752, 440, 132, 150, 244, 10, 616, 246, 132, 441, - /* 10 */ 132, 155, 821, 41, 43, 20, 35, 36, 820, 154, - /* 20 */ 821, 29, 741, 440, 200, 39, 37, 40, 38, 131, - /* 30 */ 499, 441, 96, 34, 33, 100, 151, 32, 31, 30, - /* 40 */ 41, 43, 741, 35, 36, 152, 136, 163, 29, 727, - /* 50 */ 749, 200, 39, 37, 40, 38, 185, 100, 225, 224, - /* 60 */ 34, 33, 162, 730, 32, 31, 30, 400, 401, 402, + /* 0 */ 752, 440, 133, 151, 244, 10, 616, 246, 133, 441, + /* 10 */ 133, 156, 821, 41, 43, 20, 35, 36, 820, 155, + /* 20 */ 821, 29, 741, 440, 201, 39, 37, 40, 38, 132, + /* 30 */ 499, 441, 97, 34, 33, 101, 152, 32, 31, 30, + /* 40 */ 41, 43, 741, 35, 36, 153, 137, 164, 29, 727, + /* 50 */ 749, 201, 39, 37, 40, 38, 186, 101, 225, 224, + /* 60 */ 34, 33, 163, 730, 32, 31, 30, 400, 401, 402, /* 70 */ 403, 404, 405, 406, 407, 408, 409, 410, 411, 245, - /* 80 */ 730, 41, 43, 188, 35, 36, 215, 236, 197, 29, - /* 90 */ 58, 20, 200, 39, 37, 40, 38, 32, 31, 30, - /* 100 */ 56, 34, 33, 75, 730, 32, 31, 30, 43, 236, - /* 110 */ 35, 36, 776, 817, 195, 29, 20, 20, 200, 39, - /* 120 */ 37, 40, 38, 164, 570, 727, 227, 34, 33, 440, - /* 130 */ 167, 32, 31, 30, 238, 35, 36, 441, 7, 816, - /* 140 */ 29, 61, 110, 200, 39, 37, 40, 38, 223, 228, + /* 80 */ 730, 41, 43, 189, 35, 36, 216, 236, 198, 29, + /* 90 */ 58, 20, 201, 39, 37, 40, 38, 32, 31, 30, + /* 100 */ 56, 34, 33, 76, 730, 32, 31, 30, 43, 236, + /* 110 */ 35, 36, 776, 817, 196, 29, 20, 20, 201, 39, + /* 120 */ 37, 40, 38, 165, 570, 727, 227, 34, 33, 440, + /* 130 */ 168, 32, 31, 30, 238, 35, 36, 441, 7, 816, + /* 140 */ 29, 61, 111, 201, 39, 37, 40, 38, 223, 228, /* 150 */ 727, 727, 34, 33, 50, 728, 32, 31, 30, 15, - /* 160 */ 214, 237, 213, 212, 211, 210, 209, 208, 207, 206, + /* 160 */ 215, 237, 214, 213, 212, 211, 210, 209, 208, 207, /* 170 */ 712, 51, 701, 702, 703, 704, 705, 706, 707, 708, - /* 180 */ 709, 710, 711, 159, 583, 11, 815, 574, 100, 577, - /* 190 */ 100, 580, 168, 159, 583, 222, 221, 574, 16, 577, - /* 200 */ 20, 580, 34, 33, 145, 26, 32, 31, 30, 238, - /* 210 */ 86, 85, 139, 174, 657, 156, 157, 123, 144, 199, - /* 220 */ 182, 715, 179, 714, 148, 156, 157, 159, 583, 531, - /* 230 */ 60, 574, 149, 577, 726, 580, 237, 16, 39, 37, + /* 180 */ 709, 710, 711, 160, 583, 11, 815, 574, 101, 577, + /* 190 */ 101, 580, 169, 160, 583, 222, 221, 574, 16, 577, + /* 200 */ 20, 580, 34, 33, 146, 26, 32, 31, 30, 238, + /* 210 */ 87, 86, 140, 175, 657, 157, 158, 124, 145, 200, + /* 220 */ 183, 715, 180, 714, 149, 157, 158, 160, 583, 531, + /* 230 */ 60, 574, 150, 577, 726, 580, 237, 16, 39, 37, /* 240 */ 40, 38, 27, 775, 26, 59, 34, 33, 551, 552, - /* 250 */ 32, 31, 30, 137, 113, 114, 219, 64, 67, 156, - /* 260 */ 157, 95, 515, 666, 184, 512, 123, 513, 26, 514, - /* 270 */ 523, 147, 127, 125, 240, 88, 87, 187, 42, 158, - /* 280 */ 73, 77, 239, 84, 76, 572, 528, 729, 42, 582, - /* 290 */ 79, 17, 658, 165, 166, 123, 243, 242, 92, 582, + /* 250 */ 32, 31, 30, 138, 114, 115, 68, 64, 67, 157, + /* 260 */ 158, 96, 515, 666, 185, 512, 124, 513, 26, 514, + /* 270 */ 523, 148, 128, 126, 240, 89, 88, 188, 42, 159, + /* 280 */ 74, 78, 239, 85, 77, 572, 528, 729, 42, 582, + /* 290 */ 80, 17, 658, 166, 167, 124, 243, 242, 93, 582, /* 300 */ 47, 542, 543, 600, 581, 45, 13, 12, 584, 576, - /* 310 */ 138, 579, 12, 575, 581, 578, 2, 72, 71, 48, - /* 320 */ 505, 573, 42, 743, 45, 504, 204, 9, 8, 21, - /* 330 */ 21, 140, 519, 582, 520, 517, 141, 518, 83, 82, - /* 340 */ 142, 143, 134, 130, 135, 830, 133, 786, 581, 785, - /* 350 */ 160, 782, 781, 161, 751, 721, 768, 226, 97, 767, - /* 360 */ 111, 112, 516, 668, 205, 109, 128, 24, 218, 220, - /* 370 */ 829, 69, 26, 828, 826, 115, 186, 686, 25, 22, - /* 380 */ 90, 129, 655, 78, 653, 80, 651, 650, 169, 538, - /* 390 */ 124, 648, 189, 647, 646, 644, 636, 193, 52, 740, - /* 400 */ 126, 642, 640, 638, 49, 755, 756, 101, 769, 44, - /* 410 */ 198, 196, 194, 28, 192, 190, 217, 74, 229, 230, - /* 420 */ 202, 232, 231, 614, 233, 234, 53, 235, 241, 170, - /* 430 */ 146, 62, 171, 65, 173, 172, 613, 176, 175, 178, - /* 440 */ 649, 177, 612, 89, 91, 117, 687, 118, 116, 119, - /* 450 */ 120, 643, 104, 102, 122, 725, 106, 103, 105, 121, - /* 460 */ 107, 1, 108, 23, 180, 181, 605, 183, 187, 525, - /* 470 */ 55, 539, 153, 98, 57, 191, 18, 63, 4, 544, - /* 480 */ 99, 5, 585, 3, 19, 14, 201, 6, 203, 480, - /* 490 */ 479, 478, 477, 476, 475, 474, 473, 471, 45, 444, - /* 500 */ 66, 446, 21, 501, 216, 68, 500, 498, 54, 465, - /* 510 */ 46, 463, 455, 70, 461, 457, 459, 453, 451, 472, - /* 520 */ 470, 81, 426, 442, 93, 415, 94, 413, 618, + /* 310 */ 139, 579, 12, 575, 581, 578, 2, 73, 72, 48, + /* 320 */ 505, 573, 42, 743, 45, 504, 205, 9, 8, 21, + /* 330 */ 21, 141, 519, 582, 520, 517, 142, 518, 84, 83, + /* 340 */ 143, 144, 135, 131, 136, 830, 134, 786, 581, 785, + /* 350 */ 161, 782, 781, 162, 751, 721, 768, 226, 98, 767, + /* 360 */ 112, 113, 516, 668, 206, 110, 129, 24, 219, 665, + /* 370 */ 220, 829, 26, 70, 828, 826, 187, 116, 686, 25, + /* 380 */ 91, 22, 130, 655, 79, 653, 81, 651, 650, 538, + /* 390 */ 170, 125, 190, 648, 647, 646, 644, 194, 52, 740, + /* 400 */ 636, 127, 642, 640, 638, 49, 755, 102, 756, 44, + /* 410 */ 769, 199, 197, 195, 193, 191, 28, 218, 75, 229, + /* 420 */ 230, 231, 232, 233, 234, 235, 203, 53, 241, 614, + /* 430 */ 171, 172, 147, 62, 65, 174, 613, 177, 173, 179, + /* 440 */ 612, 176, 649, 178, 181, 643, 123, 687, 117, 119, + /* 450 */ 118, 120, 121, 90, 103, 725, 108, 104, 105, 122, + /* 460 */ 106, 107, 109, 92, 1, 23, 182, 188, 605, 184, + /* 470 */ 525, 55, 539, 57, 99, 154, 192, 18, 63, 4, + /* 480 */ 544, 100, 480, 585, 3, 19, 5, 14, 202, 6, + /* 490 */ 204, 479, 478, 477, 476, 475, 474, 473, 471, 45, + /* 500 */ 217, 444, 66, 21, 501, 500, 46, 498, 54, 465, + /* 510 */ 463, 455, 461, 457, 69, 459, 71, 453, 451, 472, + /* 520 */ 470, 82, 426, 442, 94, 415, 413, 618, 617, 617, + /* 530 */ 95, }; static const YYCODETYPE yy_lookahead[] = { /* 0 */ 207, 1, 256, 206, 207, 256, 204, 205, 256, 9, @@ -300,20 +300,20 @@ static const YYCODETYPE yy_lookahead[] = { /* 370 */ 207, 207, 103, 207, 207, 207, 240, 207, 207, 207, /* 380 */ 59, 207, 207, 207, 207, 207, 207, 207, 207, 107, /* 390 */ 207, 207, 259, 207, 207, 207, 207, 259, 117, 253, - /* 400 */ 207, 207, 207, 207, 119, 208, 208, 252, 208, 116, - /* 410 */ 111, 115, 110, 121, 109, 108, 75, 84, 83, 49, - /* 420 */ 208, 82, 80, 5, 53, 81, 208, 79, 75, 132, - /* 430 */ 208, 212, 5, 212, 58, 132, 5, 5, 132, 58, - /* 440 */ 208, 132, 5, 209, 209, 220, 222, 216, 221, 219, - /* 450 */ 217, 208, 249, 251, 215, 240, 247, 250, 248, 218, - /* 460 */ 246, 213, 245, 210, 132, 58, 86, 124, 104, 97, - /* 470 */ 105, 97, 1, 96, 101, 96, 101, 72, 112, 97, - /* 480 */ 96, 112, 97, 96, 101, 96, 98, 96, 98, 9, - /* 490 */ 5, 5, 5, 5, 1, 5, 5, 5, 101, 76, - /* 500 */ 72, 58, 101, 5, 15, 127, 5, 97, 96, 5, - /* 510 */ 16, 5, 5, 127, 5, 5, 5, 5, 5, 5, - /* 520 */ 5, 58, 58, 76, 21, 59, 21, 58, 0, 267, - /* 530 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, + /* 400 */ 207, 207, 207, 207, 207, 119, 208, 252, 208, 116, + /* 410 */ 208, 111, 115, 110, 109, 108, 121, 75, 84, 83, + /* 420 */ 49, 80, 82, 53, 81, 79, 208, 208, 75, 5, + /* 430 */ 132, 5, 208, 212, 212, 58, 5, 5, 132, 58, + /* 440 */ 5, 132, 208, 132, 132, 208, 215, 222, 221, 216, + /* 450 */ 220, 219, 217, 209, 251, 240, 246, 250, 249, 218, + /* 460 */ 248, 247, 245, 209, 213, 210, 58, 104, 86, 124, + /* 470 */ 97, 105, 97, 101, 96, 1, 96, 101, 72, 112, + /* 480 */ 97, 96, 9, 97, 96, 101, 112, 96, 98, 96, + /* 490 */ 98, 5, 5, 5, 5, 1, 5, 5, 5, 101, + /* 500 */ 15, 76, 72, 101, 5, 5, 16, 97, 96, 5, + /* 510 */ 5, 5, 5, 5, 127, 5, 127, 5, 5, 5, + /* 520 */ 5, 58, 58, 76, 21, 59, 58, 0, 267, 267, + /* 530 */ 21, 267, 267, 267, 267, 267, 267, 267, 267, 267, /* 540 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, /* 550 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, /* 560 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, @@ -333,41 +333,41 @@ static const YYCODETYPE yy_lookahead[] = { /* 700 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, /* 710 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, /* 720 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - /* 730 */ 267, 267, + /* 730 */ 267, 267, 267, 267, }; #define YY_SHIFT_COUNT (246) #define YY_SHIFT_MIN (0) -#define YY_SHIFT_MAX (528) +#define YY_SHIFT_MAX (527) static const unsigned short int yy_shift_ofst[] = { /* 0 */ 141, 74, 182, 226, 128, 128, 128, 128, 128, 128, /* 10 */ 0, 22, 226, 260, 260, 260, 102, 128, 128, 128, - /* 20 */ 128, 128, 31, 149, 9, 9, 529, 192, 226, 226, + /* 20 */ 128, 128, 31, 149, 9, 9, 531, 192, 226, 226, /* 30 */ 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, /* 40 */ 226, 226, 226, 226, 226, 260, 260, 25, 25, 25, /* 50 */ 25, 25, 25, 42, 25, 165, 128, 128, 135, 135, /* 60 */ 185, 128, 128, 128, 128, 128, 128, 128, 128, 128, /* 70 */ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, /* 80 */ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, - /* 90 */ 128, 128, 128, 128, 128, 269, 321, 321, 282, 282, - /* 100 */ 321, 281, 285, 293, 299, 296, 302, 305, 307, 292, - /* 110 */ 269, 321, 321, 341, 341, 321, 333, 335, 370, 342, - /* 120 */ 339, 371, 344, 348, 321, 353, 321, 353, 529, 529, - /* 130 */ 27, 68, 68, 68, 94, 119, 213, 213, 213, 216, - /* 140 */ 169, 169, 169, 169, 190, 208, 67, 89, 60, 60, - /* 150 */ 236, 173, 204, 205, 206, 211, 304, 308, 284, 220, - /* 160 */ 199, 53, 223, 228, 229, 327, 330, 191, 201, 266, - /* 170 */ 418, 297, 427, 303, 376, 431, 306, 432, 309, 381, - /* 180 */ 437, 332, 407, 380, 343, 364, 372, 365, 373, 374, - /* 190 */ 377, 471, 379, 382, 384, 375, 366, 383, 369, 385, - /* 200 */ 387, 389, 388, 391, 390, 405, 480, 485, 486, 487, - /* 210 */ 488, 493, 490, 491, 492, 397, 423, 489, 428, 443, - /* 220 */ 494, 378, 386, 401, 498, 501, 410, 412, 401, 504, - /* 230 */ 506, 507, 509, 510, 511, 512, 513, 514, 515, 463, - /* 240 */ 464, 447, 503, 505, 466, 469, 528, + /* 90 */ 128, 128, 128, 128, 128, 128, 269, 321, 321, 282, + /* 100 */ 282, 321, 281, 286, 293, 300, 297, 303, 305, 307, + /* 110 */ 295, 269, 321, 321, 342, 342, 321, 334, 336, 371, + /* 120 */ 341, 340, 370, 343, 346, 321, 353, 321, 353, 531, + /* 130 */ 531, 27, 68, 68, 68, 94, 119, 213, 213, 213, + /* 140 */ 216, 169, 169, 169, 169, 190, 208, 67, 89, 60, + /* 150 */ 60, 236, 173, 204, 205, 206, 211, 304, 308, 284, + /* 160 */ 220, 199, 53, 223, 228, 229, 327, 330, 191, 201, + /* 170 */ 266, 424, 298, 426, 306, 377, 431, 309, 432, 311, + /* 180 */ 381, 435, 312, 408, 382, 345, 363, 373, 366, 372, + /* 190 */ 375, 378, 474, 380, 383, 385, 376, 367, 384, 374, + /* 200 */ 386, 388, 391, 390, 393, 392, 406, 473, 486, 487, + /* 210 */ 488, 489, 494, 491, 492, 493, 398, 425, 485, 430, + /* 220 */ 490, 387, 389, 402, 499, 500, 410, 412, 402, 504, + /* 230 */ 505, 506, 507, 508, 510, 512, 513, 514, 515, 463, + /* 240 */ 464, 447, 503, 509, 466, 468, 527, }; -#define YY_REDUCE_COUNT (129) +#define YY_REDUCE_COUNT (130) #define YY_REDUCE_MIN (-254) -#define YY_REDUCE_MAX (253) +#define YY_REDUCE_MAX (255) static const short yy_reduce_ofst[] = { /* 0 */ -198, -53, -254, -246, -150, -172, -192, -116, -91, -90, /* 10 */ -207, -203, -248, -179, -162, -138, -218, -175, -19, -17, @@ -378,10 +378,11 @@ static const short yy_reduce_ofst[] = { /* 60 */ 121, 153, 154, 156, 157, 159, 160, 161, 162, 163, /* 70 */ 164, 166, 167, 168, 170, 171, 172, 174, 175, 176, /* 80 */ 177, 178, 179, 180, 181, 183, 184, 186, 187, 188, - /* 90 */ 189, 193, 194, 195, 196, 136, 197, 198, 133, 138, - /* 100 */ 200, 146, 155, 202, 207, 203, 210, 209, 214, 217, - /* 110 */ 215, 212, 218, 219, 221, 222, 224, 227, 225, 231, - /* 120 */ 230, 233, 241, 239, 232, 234, 243, 235, 248, 253, + /* 90 */ 189, 193, 194, 195, 196, 197, 136, 198, 200, 133, + /* 100 */ 138, 202, 146, 155, 203, 207, 209, 212, 214, 210, + /* 110 */ 217, 215, 218, 219, 221, 222, 224, 225, 227, 230, + /* 120 */ 233, 232, 235, 241, 231, 234, 244, 237, 254, 251, + /* 130 */ 255, }; static const YYACTIONTYPE yy_default[] = { /* 0 */ 615, 667, 823, 823, 615, 615, 615, 615, 615, 615, @@ -391,21 +392,21 @@ static const YYACTIONTYPE yy_default[] = { /* 40 */ 615, 615, 615, 615, 615, 615, 615, 615, 615, 615, /* 50 */ 615, 615, 615, 615, 615, 615, 615, 615, 772, 772, /* 60 */ 746, 615, 615, 615, 615, 615, 615, 615, 615, 615, - /* 70 */ 615, 615, 615, 615, 615, 615, 615, 615, 654, 615, - /* 80 */ 652, 615, 615, 615, 615, 615, 615, 615, 615, 615, - /* 90 */ 615, 615, 641, 615, 615, 615, 635, 635, 615, 615, - /* 100 */ 635, 779, 783, 777, 765, 773, 764, 760, 759, 787, - /* 110 */ 615, 635, 635, 664, 664, 635, 685, 683, 681, 673, - /* 120 */ 679, 675, 677, 671, 635, 662, 635, 662, 700, 713, - /* 130 */ 615, 788, 822, 778, 806, 805, 818, 812, 811, 615, - /* 140 */ 810, 809, 808, 807, 615, 615, 615, 615, 814, 813, - /* 150 */ 615, 615, 615, 615, 615, 615, 615, 615, 615, 790, - /* 160 */ 784, 780, 615, 615, 615, 615, 615, 615, 615, 615, + /* 70 */ 615, 615, 615, 615, 615, 615, 615, 615, 615, 654, + /* 80 */ 615, 652, 615, 615, 615, 615, 615, 615, 615, 615, + /* 90 */ 615, 615, 615, 641, 615, 615, 615, 635, 635, 615, + /* 100 */ 615, 635, 779, 783, 777, 765, 773, 764, 760, 759, + /* 110 */ 787, 615, 635, 635, 664, 664, 635, 685, 683, 681, + /* 120 */ 673, 679, 675, 677, 671, 635, 662, 635, 662, 700, + /* 130 */ 713, 615, 788, 822, 778, 806, 805, 818, 812, 811, + /* 140 */ 615, 810, 809, 808, 807, 615, 615, 615, 615, 814, + /* 150 */ 813, 615, 615, 615, 615, 615, 615, 615, 615, 615, + /* 160 */ 790, 784, 780, 615, 615, 615, 615, 615, 615, 615, /* 170 */ 615, 615, 615, 615, 615, 615, 615, 615, 615, 615, - /* 180 */ 615, 615, 615, 615, 615, 745, 615, 615, 754, 615, - /* 190 */ 615, 615, 615, 615, 615, 774, 615, 766, 615, 615, - /* 200 */ 615, 615, 615, 615, 722, 615, 615, 615, 615, 615, - /* 210 */ 615, 615, 615, 615, 615, 688, 615, 615, 615, 615, + /* 180 */ 615, 615, 615, 615, 615, 615, 745, 615, 615, 754, + /* 190 */ 615, 615, 615, 615, 615, 615, 774, 615, 766, 615, + /* 200 */ 615, 615, 615, 615, 615, 722, 615, 615, 615, 615, + /* 210 */ 615, 615, 615, 615, 615, 615, 688, 615, 615, 615, /* 220 */ 615, 615, 615, 827, 615, 615, 615, 716, 825, 615, /* 230 */ 615, 615, 615, 615, 615, 615, 615, 615, 615, 615, /* 240 */ 615, 615, 639, 637, 615, 631, 615, @@ -1038,7 +1039,7 @@ static const char *const yyRuleName[] = { /* 44 */ "ifexists ::=", /* 45 */ "ifnotexists ::= IF NOT EXISTS", /* 46 */ "ifnotexists ::=", - /* 47 */ "cmd ::= CREATE DNODE IPTOKEN", + /* 47 */ "cmd ::= CREATE DNODE ids", /* 48 */ "cmd ::= CREATE ACCOUNT ids PASS ids acct_optr", /* 49 */ "cmd ::= CREATE DATABASE ifnotexists ids db_optr", /* 50 */ "cmd ::= CREATE USER ids PASS ids", @@ -1711,7 +1712,7 @@ static const struct { { 209, 0 }, /* (44) ifexists ::= */ { 212, -3 }, /* (45) ifnotexists ::= IF NOT EXISTS */ { 212, 0 }, /* (46) ifnotexists ::= */ - { 205, -3 }, /* (47) cmd ::= CREATE DNODE IPTOKEN */ + { 205, -3 }, /* (47) cmd ::= CREATE DNODE ids */ { 205, -6 }, /* (48) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ { 205, -5 }, /* (49) cmd ::= CREATE DATABASE ifnotexists ids db_optr */ { 205, -5 }, /* (50) cmd ::= CREATE USER ids PASS ids */ @@ -2122,7 +2123,7 @@ static void yy_reduce( case 45: /* ifnotexists ::= IF NOT EXISTS */ {yymsp[-2].minor.yy0.n = 1;} break; - case 47: /* cmd ::= CREATE DNODE IPTOKEN */ + case 47: /* cmd ::= CREATE DNODE ids */ { setDCLSQLElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &yymsp[0].minor.yy0);} break; case 48: /* cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ diff --git a/src/query/tests/astTest.cpp b/src/query/tests/astTest.cpp index dee85ef630..d767e7ad7b 100644 --- a/src/query/tests/astTest.cpp +++ b/src/query/tests/astTest.cpp @@ -582,7 +582,7 @@ void exprSerializeTest1() { tExprTreeDestroy(&p1, nullptr); tExprTreeDestroy(&p2, nullptr); - tbufClose(&bw); + // tbufClose(&bw); } void exprSerializeTest2() { @@ -627,7 +627,7 @@ void exprSerializeTest2() { tExprTreeDestroy(&p1, nullptr); tExprTreeDestroy(&p2, nullptr); - tbufClose(&bw); + // tbufClose(&bw); } } // namespace TEST(testCase, astTest) { diff --git a/src/rpc/inc/rpcCache.h b/src/rpc/inc/rpcCache.h index 2a386c066e..3a996aab7c 100644 --- a/src/rpc/inc/rpcCache.h +++ b/src/rpc/inc/rpcCache.h @@ -22,8 +22,8 @@ extern "C" { void *rpcOpenConnCache(int maxSessions, void (*cleanFp)(void *), void *tmrCtrl, int64_t keepTimer); void rpcCloseConnCache(void *handle); -void rpcAddConnIntoCache(void *handle, void *data, uint32_t ip, uint16_t port, int8_t connType); -void *rpcGetConnFromCache(void *handle, uint32_t ip, uint16_t port, int8_t connType); +void rpcAddConnIntoCache(void *handle, void *data, char *fqdn, uint16_t port, int8_t connType); +void *rpcGetConnFromCache(void *handle, char *fqdn, uint16_t port, int8_t connType); #ifdef __cplusplus } diff --git a/src/rpc/inc/rpcTcp.h b/src/rpc/inc/rpcTcp.h index 16972dbc7e..40fab00056 100644 --- a/src/rpc/inc/rpcTcp.h +++ b/src/rpc/inc/rpcTcp.h @@ -20,12 +20,12 @@ extern "C" { #endif -void *taosInitTcpServer(char *ip, uint16_t port, char *label, int numOfThreads, void *fp, void *shandle); +void *taosInitTcpServer(uint32_t ip, uint16_t port, char *label, int numOfThreads, void *fp, void *shandle); void taosCleanUpTcpServer(void *param); -void *taosInitTcpClient(char *ip, uint16_t port, char *label, int num, void *fp, void *shandle); +void *taosInitTcpClient(uint32_t ip, uint16_t port, char *label, int num, void *fp, void *shandle); void taosCleanUpTcpClient(void *chandle); -void *taosOpenTcpClientConnection(void *shandle, void *thandle, char *ip, uint16_t port); +void *taosOpenTcpClientConnection(void *shandle, void *thandle, uint32_t ip, uint16_t port); void taosCloseTcpConnection(void *chandle); int taosSendTcpData(uint32_t ip, uint16_t port, void *data, int len, void *chandle); diff --git a/src/rpc/inc/rpcUdp.h b/src/rpc/inc/rpcUdp.h index a84f7c4a49..fd60f4a089 100644 --- a/src/rpc/inc/rpcUdp.h +++ b/src/rpc/inc/rpcUdp.h @@ -22,10 +22,10 @@ extern "C" { #include "taosdef.h" -void *taosInitUdpConnection(char *ip, uint16_t port, char *label, int, void *fp, void *shandle); +void *taosInitUdpConnection(uint32_t ip, uint16_t port, char *label, int, void *fp, void *shandle); void taosCleanUpUdpConnection(void *handle); int taosSendUdpData(uint32_t ip, uint16_t port, void *data, int dataLen, void *chandle); -void *taosOpenUdpConnection(void *shandle, void *thandle, char *ip, uint16_t port); +void *taosOpenUdpConnection(void *shandle, void *thandle, uint32_t ip, uint16_t port); void taosFreeMsgHdr(void *hdr); int taosMsgHdrSize(void *hdr); diff --git a/src/rpc/src/rpcCache.c b/src/rpc/src/rpcCache.c index 48d68c7511..ab9e679acf 100644 --- a/src/rpc/src/rpcCache.c +++ b/src/rpc/src/rpcCache.c @@ -23,7 +23,7 @@ #include "rpcCache.h" typedef struct SConnHash { - uint32_t ip; + char fqdn[TSDB_FQDN_LEN]; uint16_t port; char connType; struct SConnHash *prev; @@ -46,7 +46,7 @@ typedef struct { int64_t *lockedBy; } SConnCache; -static int rpcHashConn(void *handle, uint32_t ip, uint16_t port, int8_t connType); +static int rpcHashConn(void *handle, char *fqdn, uint16_t port, int8_t connType); static void rpcLockCache(int64_t *lockedBy); static void rpcUnlockCache(int64_t *lockedBy); static void rpcCleanConnCache(void *handle, void *tmrId); @@ -114,7 +114,7 @@ void rpcCloseConnCache(void *handle) { free(pCache); } -void rpcAddConnIntoCache(void *handle, void *data, uint32_t ip, uint16_t port, int8_t connType) { +void rpcAddConnIntoCache(void *handle, void *data, char *fqdn, uint16_t port, int8_t connType) { int hash; SConnHash * pNode; SConnCache *pCache; @@ -125,9 +125,9 @@ void rpcAddConnIntoCache(void *handle, void *data, uint32_t ip, uint16_t port, i assert(pCache); assert(data); - hash = rpcHashConn(pCache, ip, port, connType); + hash = rpcHashConn(pCache, fqdn, port, connType); pNode = (SConnHash *)taosMemPoolMalloc(pCache->connHashMemPool); - pNode->ip = ip; + strcpy(pNode->fqdn, fqdn); pNode->port = port; pNode->connType = connType; pNode->data = data; @@ -147,12 +147,12 @@ void rpcAddConnIntoCache(void *handle, void *data, uint32_t ip, uint16_t port, i pCache->total++; - tTrace("%p ip:0x%x:%hu:%d:%d:%p added into cache, connections:%d", data, ip, port, connType, hash, pNode, pCache->count[hash]); + tTrace("%p %s:%hu:%d:%d:%p added into cache, connections:%d", data, fqdn, port, connType, hash, pNode, pCache->count[hash]); return; } -void *rpcGetConnFromCache(void *handle, uint32_t ip, uint16_t port, int8_t connType) { +void *rpcGetConnFromCache(void *handle, char *fqdn, uint16_t port, int8_t connType) { int hash; SConnHash * pNode; SConnCache *pCache; @@ -163,7 +163,7 @@ void *rpcGetConnFromCache(void *handle, uint32_t ip, uint16_t port, int8_t connT uint64_t time = taosGetTimestampMs(); - hash = rpcHashConn(pCache, ip, port, connType); + hash = rpcHashConn(pCache, fqdn, port, connType); rpcLockCache(pCache->lockedBy+hash); pNode = pCache->connHashList[hash]; @@ -174,7 +174,7 @@ void *rpcGetConnFromCache(void *handle, uint32_t ip, uint16_t port, int8_t connT break; } - if (pNode->ip == ip && pNode->port == port && pNode->connType == connType) break; + if (strcmp(pNode->fqdn, fqdn) == 0 && pNode->port == port && pNode->connType == connType) break; pNode = pNode->next; } @@ -201,7 +201,7 @@ void *rpcGetConnFromCache(void *handle, uint32_t ip, uint16_t port, int8_t connT rpcUnlockCache(pCache->lockedBy+hash); if (pData) { - tTrace("%p ip:0x%x:%hu:%d:%d:%p retrieved from cache, connections:%d", pData, ip, port, connType, hash, pNode, pCache->count[hash]); + tTrace("%p %s:%hu:%d:%d:%p retrieved from cache, connections:%d", pData, fqdn, port, connType, hash, pNode, pCache->count[hash]); } return pData; @@ -239,7 +239,7 @@ static void rpcRemoveExpiredNodes(SConnCache *pCache, SConnHash *pNode, int hash pNext = pNode->next; pCache->total--; pCache->count[hash]--; - tTrace("%p ip:0x%x:%hu:%d:%d:%p removed from cache, connections:%d", pNode->data, pNode->ip, pNode->port, pNode->connType, hash, pNode, + tTrace("%p %s:%hu:%d:%d:%p removed from cache, connections:%d", pNode->data, pNode->fqdn, pNode->port, pNode->connType, hash, pNode, pCache->count[hash]); taosMemPoolFree(pCache->connHashMemPool, (char *)pNode); pNode = pNext; @@ -251,12 +251,16 @@ static void rpcRemoveExpiredNodes(SConnCache *pCache, SConnHash *pNode, int hash pCache->connHashList[hash] = NULL; } -static int rpcHashConn(void *handle, uint32_t ip, uint16_t port, int8_t connType) { +static int rpcHashConn(void *handle, char *fqdn, uint16_t port, int8_t connType) { SConnCache *pCache = (SConnCache *)handle; int hash = 0; + char *temp = fqdn; + + while (*temp) { + hash += *temp; + ++temp; + } - hash = ip >> 16; - hash += (unsigned short)(ip & 0xFFFF); hash += port; hash += connType; diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c index dede169349..f616cd00b7 100644 --- a/src/rpc/src/rpcMain.c +++ b/src/rpc/src/rpcMain.c @@ -44,7 +44,6 @@ typedef struct { int sessions; // number of sessions allowed int numOfThreads; // number of threads to process incoming messages int idleTime; // milliseconds; - char localIp[TSDB_IPv4ADDR_LEN]; uint16_t localPort; int8_t connType; int index; // for UDP server only, round robin for multiple threads @@ -101,9 +100,8 @@ typedef struct SRpcConn { uint16_t localPort; // for UDP only uint32_t linkUid; // connection unique ID assigned by client uint32_t peerIp; // peer IP - uint32_t destIp; // server destination IP to handle NAT uint16_t peerPort; // peer port - char peerIpstr[TSDB_IPv4ADDR_LEN]; // peer IP string + char peerFqdn[TSDB_FQDN_LEN]; // peer FQDN or ip string uint16_t tranId; // outgoing transcation ID, for build message uint16_t outTranId; // outgoing transcation ID uint16_t inTranId; // transcation ID for incoming msg @@ -140,7 +138,7 @@ int tsRpcOverhead; #define RPC_CONN_TCPC 3 #define RPC_CONN_TCP 2 -void *(*taosInitConn[])(char *ip, uint16_t port, char *label, int threads, void *fp, void *shandle) = { +void *(*taosInitConn[])(uint32_t ip, uint16_t port, char *label, int threads, void *fp, void *shandle) = { taosInitUdpConnection, taosInitUdpConnection, taosInitTcpServer, @@ -161,7 +159,7 @@ int (*taosSendData[])(uint32_t ip, uint16_t port, void *data, int len, void *cha taosSendTcpData }; -void *(*taosOpenConn[])(void *shandle, void *thandle, char *ip, uint16_t port) = { +void *(*taosOpenConn[])(void *shandle, void *thandle, uint32_t ip, uint16_t port) = { taosOpenUdpConnection, taosOpenUdpConnection, NULL, @@ -175,7 +173,7 @@ void (*taosCloseConn[])(void *chandle) = { taosCloseTcpConnection }; -static SRpcConn *rpcOpenConn(SRpcInfo *pRpc, char *peerIpStr, uint16_t peerPort, int8_t connType); +static SRpcConn *rpcOpenConn(SRpcInfo *pRpc, char *peerFqdn, uint16_t peerPort, int8_t connType); static void rpcCloseConn(void *thandle); static SRpcConn *rpcSetupConnToServer(SRpcReqContext *pContext); static SRpcConn *rpcAllocateClientConn(SRpcInfo *pRpc); @@ -217,7 +215,6 @@ void *rpcOpen(const SRpcInit *pInit) { pRpc->connType = pInit->connType; pRpc->idleTime = pInit->idleTime; pRpc->numOfThreads = pInit->numOfThreads>TSDB_MAX_RPC_THREADS ? TSDB_MAX_RPC_THREADS:pInit->numOfThreads; - if (pInit->localIp) strcpy(pRpc->localIp, pInit->localIp); pRpc->localPort = pInit->localPort; pRpc->afp = pInit->afp; pRpc->sessions = pInit->sessions; @@ -229,13 +226,13 @@ void *rpcOpen(const SRpcInit *pInit) { pRpc->cfp = pInit->cfp; pRpc->afp = pInit->afp; - pRpc->tcphandle = (*taosInitConn[pRpc->connType|RPC_CONN_TCP])(pRpc->localIp, pRpc->localPort, pRpc->label, + pRpc->tcphandle = (*taosInitConn[pRpc->connType|RPC_CONN_TCP])(0, pRpc->localPort, pRpc->label, pRpc->numOfThreads, rpcProcessMsgFromPeer, pRpc); - pRpc->udphandle = (*taosInitConn[pRpc->connType])(pRpc->localIp, pRpc->localPort, pRpc->label, + pRpc->udphandle = (*taosInitConn[pRpc->connType])(0, pRpc->localPort, pRpc->label, pRpc->numOfThreads, rpcProcessMsgFromPeer, pRpc); if (pRpc->tcphandle == NULL || pRpc->udphandle == NULL) { - tError("%s failed to init network, %s:%d", pRpc->label, pRpc->localIp, pRpc->localPort); + tError("%s failed to init network, port:%d", pRpc->label, pRpc->localPort); rpcClose(pRpc); return NULL; } @@ -457,7 +454,7 @@ int rpcGetConnInfo(void *thandle, SRpcConnInfo *pInfo) { pInfo->clientIp = pConn->peerIp; pInfo->clientPort = pConn->peerPort; - pInfo->serverIp = pConn->destIp; + // pInfo->serverIp = pConn->destIp; strcpy(pInfo->user, pConn->user); return 0; @@ -490,27 +487,32 @@ static void rpcFreeMsg(void *msg) { } } -static SRpcConn *rpcOpenConn(SRpcInfo *pRpc, char *peerIpStr, uint16_t peerPort, int8_t connType) { +static SRpcConn *rpcOpenConn(SRpcInfo *pRpc, char *peerFqdn, uint16_t peerPort, int8_t connType) { SRpcConn *pConn; + uint32_t peerIp = taosGetIpFromFqdn(peerFqdn); + if (peerIp == -1) { + tError("%s, failed to resolve FQDN:%s", pRpc->label, peerFqdn); + return NULL; + } + pConn = rpcAllocateClientConn(pRpc); if (pConn) { - strcpy(pConn->peerIpstr, peerIpStr); - pConn->peerIp = inet_addr(peerIpStr); + strcpy(pConn->peerFqdn, peerFqdn); + pConn->peerIp = peerIp; pConn->peerPort = peerPort; strcpy(pConn->user, pRpc->user); pConn->connType = connType; if (taosOpenConn[connType]) { void *shandle = (connType & RPC_CONN_TCP)? pRpc->tcphandle:pRpc->udphandle; - pConn->chandle = (*taosOpenConn[connType])(shandle, pConn, pConn->peerIpstr, pConn->peerPort); + pConn->chandle = (*taosOpenConn[connType])(shandle, pConn, pConn->peerIp, pConn->peerPort); if (pConn->chandle) { - tTrace("%s %p, rpc connection is set up, sid:%d id:%s ip:%s:%hu connType:%d", pRpc->label, - pConn, pConn->sid, pRpc->user, pConn->peerIpstr, pConn->peerPort, pConn->connType); + tTrace("%s %p, rpc connection is set up, sid:%d id:%s %s:%hu connType:%d", pRpc->label, + pConn, pConn->sid, pRpc->user, peerFqdn, pConn->peerPort, pConn->connType); } else { - tError("%s %p, failed to set up connection to ip:%s:%hu", pRpc->label, pConn, - pConn->peerIpstr, pConn->peerPort); + tError("%s %p, failed to set up connection to %s:%hu", pRpc->label, pConn, peerFqdn, pConn->peerPort); terrno = TSDB_CODE_NETWORK_UNAVAIL; rpcCloseConn(pConn); pConn = NULL; @@ -661,12 +663,9 @@ static SRpcConn *rpcSetupConnToServer(SRpcReqContext *pContext) { SRpcInfo *pRpc = pContext->pRpc; SRpcIpSet *pIpSet = &pContext->ipSet; - pConn = rpcGetConnFromCache(pRpc->pCache, pIpSet->ip[pIpSet->inUse], pIpSet->port, pContext->connType); + pConn = rpcGetConnFromCache(pRpc->pCache, pIpSet->fqdn[pIpSet->inUse], pIpSet->port[pIpSet->inUse], pContext->connType); if ( pConn == NULL || pConn->user[0] == 0) { - char ipstr[20] = {0}; - tinet_ntoa(ipstr, pIpSet->ip[pIpSet->inUse]); - pConn = rpcOpenConn(pRpc, ipstr, pIpSet->port, pContext->connType); - if (pConn) pConn->destIp = pIpSet->ip[pIpSet->inUse]; + pConn = rpcOpenConn(pRpc, pIpSet->fqdn[pIpSet->inUse], pIpSet->port[pIpSet->inUse], pContext->connType); } else { tTrace("%s %p, connection is retrieved from cache", pRpc->label, pConn); } @@ -789,7 +788,7 @@ static SRpcConn *rpcProcessMsgHead(SRpcInfo *pRpc, SRecvInfo *pRecv) { pConn->peerIp = pRecv->ip; char ipstr[20] = {0}; tinet_ntoa(ipstr, pRecv->ip); - strcpy(pConn->peerIpstr, ipstr); + strcpy(pConn->peerFqdn, ipstr); } if (pRecv->port) pConn->peerPort = pRecv->port; @@ -922,7 +921,6 @@ static void rpcProcessIncomingMsg(SRpcConn *pConn, SRpcHead *pHead) { if ( rpcIsReq(pHead->msgType) ) { rpcMsg.handle = pConn; - pConn->destIp = pHead->destIp; taosTmrReset(rpcProcessProgressTimer, tsRpcTimer/2, pConn, pRpc->tmrCtrl, &pConn->pTimer); (*(pRpc->cfp))(&rpcMsg); } else { @@ -932,7 +930,7 @@ static void rpcProcessIncomingMsg(SRpcConn *pConn, SRpcHead *pHead) { pConn->pContext = NULL; // for UDP, port may be changed by server, the port in ipSet shall be used for cache - rpcAddConnIntoCache(pRpc->pCache, pConn, pConn->peerIp, pContext->ipSet.port, pConn->connType); + rpcAddConnIntoCache(pRpc->pCache, pConn, pConn->peerFqdn, pContext->ipSet.port[pContext->ipSet.inUse], pConn->connType); if (pHead->code == TSDB_CODE_REDIRECT) { pContext->redirect = 1; @@ -1053,7 +1051,6 @@ static void rpcSendReqToServer(SRpcInfo *pRpc, SRpcReqContext *pContext) { pHead->tranId = pConn->tranId; pHead->sourceId = pConn->ownId; pHead->destId = pConn->peerId; - pHead->destIp = pConn->destIp; pHead->port = 0; pHead->linkUid = pConn->linkUid; if (!pConn->secured) memcpy(pHead->user, pConn->user, tListLen(pHead->user)); @@ -1081,12 +1078,12 @@ static void rpcSendMsgToPeer(SRpcConn *pConn, void *msg, int msgLen) { if ( rpcIsReq(pHead->msgType)) { if (pHead->msgType < TSDB_MSG_TYPE_CM_HEARTBEAT || (rpcDebugFlag & 16)) tTrace("%s %p, %s is sent to %s:%hu, len:%d sig:0x%08x:0x%08x:%d", - pRpc->label, pConn, taosMsg[pHead->msgType], pConn->peerIpstr, + pRpc->label, pConn, taosMsg[pHead->msgType], pConn->peerFqdn, pConn->peerPort, msgLen, pHead->sourceId, pHead->destId, pHead->tranId); } else { if (pHead->msgType < TSDB_MSG_TYPE_CM_HEARTBEAT || (rpcDebugFlag & 16)) tTrace( "%s %p, %s is sent to %s:%hu, code:0x%x len:%d sig:0x%08x:0x%08x:%d", - pRpc->label, pConn, taosMsg[pHead->msgType], pConn->peerIpstr, pConn->peerPort, + pRpc->label, pConn, taosMsg[pHead->msgType], pConn->peerFqdn, pConn->peerPort, htonl(pHead->code), msgLen, pHead->sourceId, pHead->destId, pHead->tranId); } @@ -1141,13 +1138,13 @@ static void rpcProcessRetryTimer(void *param, void *tmrId) { if (pConn->retry < 4) { tTrace("%s %p, re-send msg:%s to %s:%hud", pRpc->label, pConn, - taosMsg[pConn->outType], pConn->peerIpstr, pConn->peerPort); + taosMsg[pConn->outType], pConn->peerFqdn, pConn->peerPort); rpcSendMsgToPeer(pConn, pConn->pReqMsg, pConn->reqMsgLen); taosTmrReset(rpcProcessRetryTimer, tsRpcTimer, pConn, pRpc->tmrCtrl, &pConn->pTimer); } else { // close the connection tTrace("%s %p, failed to send msg:%s to %s:%hu", pRpc->label, pConn, - taosMsg[pConn->outType], pConn->peerIpstr, pConn->peerPort); + taosMsg[pConn->outType], pConn->peerFqdn, pConn->peerPort); reportDisc = 1; } } else { diff --git a/src/rpc/src/rpcTcp.c b/src/rpc/src/rpcTcp.c index bac2ae879a..1260a34512 100644 --- a/src/rpc/src/rpcTcp.c +++ b/src/rpc/src/rpcTcp.c @@ -40,7 +40,7 @@ typedef struct SThreadObj { SFdObj * pHead; pthread_mutex_t mutex; pthread_cond_t fdReady; - char ipstr[TSDB_IPv4ADDR_LEN]; + uint32_t ip; int pollFd; int numOfFds; int threadId; @@ -50,7 +50,7 @@ typedef struct SThreadObj { } SThreadObj; typedef struct { - char ip[TSDB_IPv4ADDR_LEN]; + uint32_t ip; uint16_t port; char label[12]; int numOfThreads; @@ -65,12 +65,12 @@ static void taosFreeFdObj(SFdObj *pFdObj); static void taosReportBrokenLink(SFdObj *pFdObj); static void taosAcceptTcpConnection(void *arg); -void *taosInitTcpServer(char *ip, uint16_t port, char *label, int numOfThreads, void *fp, void *shandle) { +void *taosInitTcpServer(uint32_t ip, uint16_t port, char *label, int numOfThreads, void *fp, void *shandle) { SServerObj *pServerObj; SThreadObj *pThreadObj; pServerObj = (SServerObj *)calloc(sizeof(SServerObj), 1); - strcpy(pServerObj->ip, ip); + pServerObj->ip = ip; pServerObj->port = port; strcpy(pServerObj->label, label); pServerObj->numOfThreads = numOfThreads; @@ -138,7 +138,7 @@ void *taosInitTcpServer(char *ip, uint16_t port, char *label, int numOfThreads, free(pServerObj); pServerObj = NULL; } else { - tTrace("%s TCP server is initialized, ip:%s port:%hu numOfThreads:%d", label, ip, port, numOfThreads); + tTrace("%s TCP server is initialized, ip:0x%x port:%hu numOfThreads:%d", label, ip, port, numOfThreads); } return (void *)pServerObj; @@ -222,14 +222,14 @@ static void taosAcceptTcpConnection(void *arg) { } } -void *taosInitTcpClient(char *ip, uint16_t port, char *label, int num, void *fp, void *shandle) { +void *taosInitTcpClient(uint32_t ip, uint16_t port, char *label, int num, void *fp, void *shandle) { SThreadObj *pThreadObj; pthread_attr_t thattr; pThreadObj = (SThreadObj *)malloc(sizeof(SThreadObj)); memset(pThreadObj, 0, sizeof(SThreadObj)); strcpy(pThreadObj->label, label); - strcpy(pThreadObj->ipstr, ip); + pThreadObj->ip = ip; pThreadObj->shandle = shandle; if (pthread_mutex_init(&(pThreadObj->mutex), NULL) < 0) { @@ -284,21 +284,19 @@ void taosCleanUpTcpClient(void *chandle) { tfree(pThreadObj); } -void *taosOpenTcpClientConnection(void *shandle, void *thandle, char *ip, uint16_t port) { +void *taosOpenTcpClientConnection(void *shandle, void *thandle, uint32_t ip, uint16_t port) { SThreadObj * pThreadObj = shandle; - struct in_addr destIp; - int fd = taosOpenTcpClientSocket(ip, port, pThreadObj->ipstr); + int fd = taosOpenTcpClientSocket(ip, port, pThreadObj->ip); if (fd <= 0) return NULL; - inet_aton(ip, &destIp); SFdObj *pFdObj = taosMallocFdObj(pThreadObj, fd); if (pFdObj) { pFdObj->thandle = thandle; pFdObj->port = port; - pFdObj->ip = destIp.s_addr; - tTrace("%s %p, TCP connection to %s:%hu is created, FD:%p numOfFds:%d", + pFdObj->ip = ip; + tTrace("%s %p, TCP connection to 0x%x:%hu is created, FD:%p numOfFds:%d", pThreadObj->label, thandle, ip, port, pFdObj, pThreadObj->numOfFds); } else { close(fd); @@ -403,7 +401,7 @@ static void *taosProcessTcpData(void *param) { continue; } - // tTrace("%s TCP data is received, ip:%s:%u len:%d", pThreadObj->label, pFdObj->ipstr, pFdObj->port, msgLen); + // tTrace("%s TCP data is received, ip:0x%x:%u len:%d", pThreadObj->label, pFdObj->ip, pFdObj->port, msgLen); memcpy(msg, &rpcHead, sizeof(SRpcHead)); recvInfo.msg = msg; diff --git a/src/rpc/src/rpcUdp.c b/src/rpc/src/rpcUdp.c index 25668fcb14..4a5fc7ba27 100644 --- a/src/rpc/src/rpcUdp.c +++ b/src/rpc/src/rpcUdp.c @@ -51,7 +51,7 @@ typedef struct { typedef struct { int index; int server; - char ip[16]; // local IP + uint32_t ip; // local IP uint16_t port; // local Port void *shandle; // handle passed by upper layer during server initialization int threads; @@ -77,7 +77,7 @@ static void *taosRecvUdpData(void *param); static SUdpBuf *taosCreateUdpBuf(SUdpConn *pConn, uint32_t ip, uint16_t port); static void taosProcessUdpBufTimer(void *param, void *tmrId); -void *taosInitUdpConnection(char *ip, uint16_t port, char *label, int threads, void *fp, void *shandle) { +void *taosInitUdpConnection(uint32_t ip, uint16_t port, char *label, int threads, void *fp, void *shandle) { SUdpConn *pConn; SUdpConnSet *pSet; @@ -89,7 +89,7 @@ void *taosInitUdpConnection(char *ip, uint16_t port, char *label, int threads, v } memset(pSet, 0, (size_t)size); - strcpy(pSet->ip, ip); + pSet->ip = ip; pSet->port = port; pSet->shandle = shandle; pSet->fp = fp; @@ -111,7 +111,7 @@ void *taosInitUdpConnection(char *ip, uint16_t port, char *label, int threads, v ownPort = (port ? port + i : 0); pConn->fd = taosOpenUdpSocket(ip, ownPort); if (pConn->fd < 0) { - tError("%s failed to open UDP socket %s:%hu", label, ip, port); + tError("%s failed to open UDP socket %x:%hu", label, ip, port); taosCleanUpUdpConnection(pSet); return NULL; } @@ -157,7 +157,7 @@ void *taosInitUdpConnection(char *ip, uint16_t port, char *label, int threads, v ++pSet->threads; } - tTrace("%s UDP connection is initialized, ip:%s port:%hu threads:%d", label, ip, port, threads); + tTrace("%s UDP connection is initialized, ip:%x port:%hu threads:%d", label, ip, port, threads); return pSet; } @@ -190,7 +190,7 @@ void taosCleanUpUdpConnection(void *handle) { tfree(pSet); } -void *taosOpenUdpConnection(void *shandle, void *thandle, char *ip, uint16_t port) { +void *taosOpenUdpConnection(void *shandle, void *thandle, uint32_t ip, uint16_t port) { SUdpConnSet *pSet = (SUdpConnSet *)shandle; pSet->index = (pSet->index + 1) % pSet->threads; @@ -198,7 +198,7 @@ void *taosOpenUdpConnection(void *shandle, void *thandle, char *ip, uint16_t por SUdpConn *pConn = pSet->udpConn + pSet->index; pConn->port = port; - tTrace("%s UDP connection is setup, ip: %s:%hu, local: %s:%d", pConn->label, ip, port, pSet->ip, + tTrace("%s UDP connection is setup, ip:%x:%hu, local:%x:%d", pConn->label, ip, port, pSet->ip, ntohs((uint16_t)pConn->localPort)); return pConn; diff --git a/src/rpc/test/rclient.c b/src/rpc/test/rclient.c index 8fb549df8f..2aa1f0e4e9 100644 --- a/src/rpc/test/rclient.c +++ b/src/rpc/test/rclient.c @@ -88,13 +88,13 @@ int main(int argc, char *argv[]) { // server info ipSet.numOfIps = 1; ipSet.inUse = 0; - ipSet.port = 7000; - ipSet.ip[0] = inet_addr(serverIp); - ipSet.ip[1] = inet_addr("192.168.0.1"); + ipSet.port[0] = 7000; + ipSet.port[1] = 7000; + strcpy(ipSet.fqdn[0], serverIp); + strcpy(ipSet.fqdn[1], "192.168.0.1"); // client info memset(&rpcInit, 0, sizeof(rpcInit)); - rpcInit.localIp = "0.0.0.0"; rpcInit.localPort = 0; rpcInit.label = "APP"; rpcInit.numOfThreads = 1; @@ -110,11 +110,9 @@ int main(int argc, char *argv[]) { for (int i=1; imaxBytes = maxBytes; pCache->cacheBlockSize = cacheBlockSize; + pCache->totalCacheBlocks = totalBlocks; pCache->pRepo = pRepo; - int nBlocks = maxBytes / cacheBlockSize + 1; - if (nBlocks <= 1) nBlocks = 2; - pCache->totalCacheBlocks = nBlocks; - STsdbCachePool *pPool = &(pCache->pool); pPool->index = 0; pPool->memPool = tdListNew(sizeof(STsdbCacheBlock *)); if (pPool->memPool == NULL) goto _err; - for (int i = 0; i < nBlocks; i++) { + for (int i = 0; i < totalBlocks; i++) { STsdbCacheBlock *pBlock = (STsdbCacheBlock *)malloc(sizeof(STsdbCacheBlock) + cacheBlockSize); if (pBlock == NULL) { goto _err; diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c index 64c051df3f..c0f6030fa6 100644 --- a/src/tsdb/src/tsdbMain.c +++ b/src/tsdb/src/tsdbMain.c @@ -5,6 +5,7 @@ #include "tsdb.h" #include "tsdbMain.h" #include "tscompression.h" +#include "tchecksum.h" #define TSDB_DEFAULT_PRECISION TSDB_PRECISION_MILLI // default precision #define IS_VALID_PRECISION(precision) (((precision) >= TSDB_PRECISION_MILLI) && ((precision) <= TSDB_PRECISION_NANO)) @@ -157,7 +158,7 @@ static int tsdbRestoreInfo(STsdbRepo *pRepo) { tsdbInitFileGroupIter(pFileH, &iter, TSDB_ORDER_ASC); while ((pFGroup = tsdbGetFileGroupNext(&iter)) != NULL) { if (tsdbSetAndOpenHelperFile(&rhelper, pFGroup) < 0) goto _err; - for (int i = 0; i < pRepo->config.maxTables; i++) { + for (int i = 1; i < pRepo->config.maxTables; i++) { STable * pTable = pMeta->tables[i]; SCompIdx *pIdx = &rhelper.pCompIdx[i]; @@ -202,7 +203,7 @@ TsdbRepoT *tsdbOpenRepo(char *tsdbDir, STsdbAppH *pAppH) { return NULL; } - pRepo->tsdbCache = tsdbInitCache(-1, -1, (TsdbRepoT *)pRepo); + pRepo->tsdbCache = tsdbInitCache(pRepo->config.cacheBlockSize, pRepo->config.totalBlocks, (TsdbRepoT *)pRepo); if (pRepo->tsdbCache == NULL) { tsdbFreeMeta(pRepo->tsdbMeta); free(pRepo->rootDir); @@ -259,7 +260,7 @@ int32_t tsdbCloseRepo(TsdbRepoT *repo) { } pRepo->commit = 1; // Loop to move pData to iData - for (int i = 0; i < pRepo->config.maxTables; i++) { + for (int i = 1; i < pRepo->config.maxTables; i++) { STable *pTable = pRepo->tsdbMeta->tables[i]; if (pTable != NULL && pTable->mem != NULL) { pTable->imem = pTable->mem; @@ -312,7 +313,7 @@ int32_t tsdbTriggerCommit(TsdbRepoT *repo) { } pRepo->commit = 1; // Loop to move pData to iData - for (int i = 0; i < pRepo->config.maxTables; i++) { + for (int i = 1; i < pRepo->config.maxTables; i++) { STable *pTable = pRepo->tsdbMeta->tables[i]; if (pTable != NULL && pTable->mem != NULL) { pTable->imem = pTable->mem; @@ -367,6 +368,15 @@ int tsdbAlterTable(TsdbRepoT *pRepo, STableCfg *pCfg) { return 0; } +TSKEY tsdbGetTableLastKey(TsdbRepoT *repo, int64_t uid) { + STsdbRepo *pRepo = (STsdbRepo *)repo; + + STable *pTable = tsdbGetTableByUid(pRepo->tsdbMeta, uid); + if (pTable == NULL) return -1; + + return TSDB_GET_TABLE_LAST_KEY(pTable); +} + int tsdbDropTable(TsdbRepoT *repo, STableId tableId) { if (repo == NULL) return -1; STsdbRepo *pRepo = (STsdbRepo *)repo; @@ -601,6 +611,10 @@ static int32_t tsdbCheckAndSetDefaultCfg(STsdbCfg *pCfg) { if (pCfg->maxTables < TSDB_MIN_TABLES || pCfg->maxTables > TSDB_MAX_TABLES) return -1; } + // Since tableId starts from 1, we increase maxTables by 1 + // TODO: take a fancier way to do this + pCfg->maxTables++; + // Check daysPerFile if (pCfg->daysPerFile == -1) { pCfg->daysPerFile = TSDB_DEFAULT_DAYS_PER_FILE; @@ -823,7 +837,7 @@ static int tsdbReadRowsFromCache(SSkipListIterator *pIter, TSKEY maxKey, int max static void tsdbDestroyTableIters(SSkipListIterator **iters, int maxTables) { if (iters == NULL) return; - for (int tid = 0; tid < maxTables; tid++) { + for (int tid = 1; tid < maxTables; tid++) { if (iters[tid] == NULL) continue; tSkipListDestroyIter(iters[tid]); } @@ -835,7 +849,7 @@ static SSkipListIterator **tsdbCreateTableIters(STsdbMeta *pMeta, int maxTables) SSkipListIterator **iters = (SSkipListIterator **)calloc(maxTables, sizeof(SSkipListIterator *)); if (iters == NULL) return NULL; - for (int tid = 0; tid < maxTables; tid++) { + for (int tid = 1; tid < maxTables; tid++) { STable *pTable = pMeta->tables[tid]; if (pTable == NULL || pTable->imem == NULL) continue; @@ -902,7 +916,7 @@ _exit: free(pCache->imem); pCache->imem = NULL; pRepo->commit = 0; - for (int i = 0; i < pCfg->maxTables; i++) { + for (int i = 1; i < pCfg->maxTables; i++) { STable *pTable = pMeta->tables[i]; if (pTable && pTable->imem) { tsdbFreeMemTable(pTable->imem); @@ -915,7 +929,7 @@ _exit: } static int tsdbCommitToFile(STsdbRepo *pRepo, int fid, SSkipListIterator **iters, SRWHelper *pHelper, SDataCols *pDataCols) { - + char dataDir[128] = {0}; STsdbMeta * pMeta = pRepo->tsdbMeta; STsdbFileH *pFileH = pRepo->tsdbFileH; STsdbCfg * pCfg = &pRepo->config; @@ -936,7 +950,7 @@ static int tsdbCommitToFile(STsdbRepo *pRepo, int fid, SSkipListIterator **iters if (tsdbSetAndOpenHelperFile(pHelper, pGroup) < 0) goto _err; // Loop to commit data in each table - for (int tid = 0; tid < pCfg->maxTables; tid++) { + for (int tid = 1; tid < pCfg->maxTables; tid++) { STable * pTable = pMeta->tables[tid]; if (pTable == NULL) continue; @@ -974,7 +988,6 @@ static int tsdbCommitToFile(STsdbRepo *pRepo, int fid, SSkipListIterator **iters // Write the SCompBlock part if (tsdbWriteCompInfo(pHelper) < 0) goto _err; - } if (tsdbWriteCompIdx(pHelper) < 0) goto _err; diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c index 9b606fa50a..0fd6bc8ae6 100644 --- a/src/tsdb/src/tsdbMeta.c +++ b/src/tsdb/src/tsdbMeta.c @@ -129,7 +129,7 @@ int tsdbRestoreTable(void *pHandle, void *cont, int contLen) { void tsdbOrgMeta(void *pHandle) { STsdbMeta *pMeta = (STsdbMeta *)pHandle; - for (int i = 0; i < pMeta->maxTables; i++) { + for (int i = 1; i < pMeta->maxTables; i++) { STable *pTable = pMeta->tables[i]; if (pTable != NULL && pTable->type == TSDB_CHILD_TABLE) { tsdbAddTableIntoIndex(pMeta, pTable); @@ -179,7 +179,7 @@ int32_t tsdbFreeMeta(STsdbMeta *pMeta) { tsdbCloseMetaFile(pMeta->mfh); - for (int i = 0; i < pMeta->maxTables; i++) { + for (int i = 1; i < pMeta->maxTables; i++) { if (pMeta->tables[i] != NULL) { tsdbFreeTable(pMeta->tables[i]); } @@ -242,7 +242,7 @@ int32_t tsdbGetTableTagVal(TsdbRepoT* repo, STableId id, int32_t colId, int16_t* assert(pCol != NULL); SDataRow row = (SDataRow)pTable->tagVal; - char* d = dataRowAt(row, TD_DATA_ROW_HEAD_SIZE); + char* d = dataRowTuple(row); *val = d; *type = pCol->type; @@ -451,9 +451,8 @@ static int tsdbAddTableToMeta(STsdbMeta *pMeta, STable *pTable, bool addIdx) { // Update the pMeta->maxCols and pMeta->maxRowBytes if (pTable->type == TSDB_SUPER_TABLE || pTable->type == TSDB_NORMAL_TABLE) { if (schemaNCols(pTable->schema) > pMeta->maxCols) pMeta->maxCols = schemaNCols(pTable->schema); - int bytes = tdMaxRowBytesFromSchema(pTable->schema); + int bytes = dataRowMaxBytesFromSchema(pTable->schema); if (bytes > pMeta->maxRowBytes) pMeta->maxRowBytes = bytes; - tdUpdateSchema(pTable->schema); } return tsdbAddTableIntoMap(pMeta, pTable); @@ -524,5 +523,5 @@ static int tsdbEstimateTableEncodeSize(STable *pTable) { char *getTupleKey(const void * data) { SDataRow row = (SDataRow)data; - return dataRowAt(row, TD_DATA_ROW_HEAD_SIZE); + return POINTER_DRIFT(row, TD_DATA_ROW_HEAD_SIZE); } \ No newline at end of file diff --git a/src/tsdb/src/tsdbRWHelper.c b/src/tsdb/src/tsdbRWHelper.c index 25989a2322..ee2f29ea55 100644 --- a/src/tsdb/src/tsdbRWHelper.c +++ b/src/tsdb/src/tsdbRWHelper.c @@ -131,6 +131,11 @@ static int tsdbInitHelper(SRWHelper *pHelper, STsdbRepo *pRepo, tsdb_rw_helper_t // Init block part if (tsdbInitHelperBlock(pHelper) < 0) goto _err; + pHelper->blockBuffer = + tmalloc(sizeof(SCompData) + (sizeof(SCompCol) + sizeof(TSCKSUM) + COMP_OVERFLOW_BYTES) * pHelper->config.maxCols + + pHelper->config.maxRowSize * pHelper->config.maxRowsPerFileBlock + sizeof(TSCKSUM)); + if (pHelper->blockBuffer == NULL) goto _err; + return 0; _err: @@ -149,6 +154,8 @@ int tsdbInitWriteHelper(SRWHelper *pHelper, STsdbRepo *pRepo) { void tsdbDestroyHelper(SRWHelper *pHelper) { if (pHelper) { + tzfree(pHelper->blockBuffer); + tzfree(pHelper->compBuffer); tsdbDestroyHelperFile(pHelper); tsdbDestroyHelperTable(pHelper); tsdbDestroyHelperBlock(pHelper); @@ -330,7 +337,7 @@ int tsdbWriteDataBlock(SRWHelper *pHelper, SDataCols *pDataCols) { int blkIdx = (pCompBlock == NULL) ? (pIdx->numOfBlocks - 1) : (pCompBlock - pHelper->pCompInfo->blocks); if (pCompBlock == NULL) { // No key overlap, must has last block, just merge with the last block - ASSERT(pIdx->hasLast && pHelper->pCompInfo->blocks[pIdx->numOfSuperBlocks - 1].last); + ASSERT(pIdx->hasLast && pHelper->pCompInfo->blocks[pIdx->numOfBlocks - 1].last); rowsToWrite = tsdbMergeDataWithBlock(pHelper, blkIdx, pDataCols); if (rowsToWrite < 0) goto _err; } else { // Has key overlap @@ -552,61 +559,97 @@ int tsdbLoadBlockDataCols(SRWHelper *pHelper, SDataCols *pDataCols, int blkIdx, return 0; } +static int tsdbCheckAndDecodeColumnData(SDataCol *pDataCol, char *content, int32_t len, int8_t comp, int numOfPoints, + int maxPoints, char *buffer, int bufferSize) { + // Verify by checksum + if (!taosCheckChecksumWhole((uint8_t *)content, len)) return -1; + + // Decode the data + if (comp) { + // // Need to decompress + pDataCol->len = (*(tDataTypeDesc[pDataCol->type].decompFunc))( + content, len - sizeof(TSCKSUM), numOfPoints, pDataCol->pData, pDataCol->spaceSize, comp, buffer, bufferSize); + if (pDataCol->type == TSDB_DATA_TYPE_BINARY || pDataCol->type == TSDB_DATA_TYPE_NCHAR) { + pDataCol->len += (sizeof(int32_t) * maxPoints); + dataColSetOffset(pDataCol, numOfPoints); + } + } else { + // No need to decompress, just memcpy it + switch (pDataCol->type) { + case TSDB_DATA_TYPE_BINARY: + case TSDB_DATA_TYPE_NCHAR: + pDataCol->len = sizeof(int32_t) * maxPoints; + memcpy((char *)pDataCol->pData + pDataCol->len, content, len - sizeof(TSCKSUM)); + pDataCol->len += (len - sizeof(TSCKSUM)); + dataColSetOffset(pDataCol, numOfPoints); + break; + + default: + pDataCol->len = len - sizeof(TSCKSUM); + memcpy(pDataCol->pData, content, pDataCol->len); + break; + } + } + return 0; +} + /** * Interface to read the data of a sub-block OR the data of a super-block of which (numOfSubBlocks == 1) */ static int tsdbLoadBlockDataImpl(SRWHelper *pHelper, SCompBlock *pCompBlock, SDataCols *pDataCols) { ASSERT(pCompBlock->numOfSubBlocks <= 1); - SCompData *pCompData = (SCompData *)malloc(pCompBlock->len); - if (pCompData == NULL) return -1; + ASSERT(tsizeof(pHelper->blockBuffer) >= pCompBlock->len); + + SCompData *pCompData = (SCompData *)pHelper->blockBuffer; int fd = (pCompBlock->last) ? pHelper->files.lastF.fd : pHelper->files.dataF.fd; if (lseek(fd, pCompBlock->offset, SEEK_SET) < 0) goto _err; if (tread(fd, (void *)pCompData, pCompBlock->len) < pCompBlock->len) goto _err; ASSERT(pCompData->numOfCols == pCompBlock->numOfCols); - // TODO : check the checksum - size_t tsize = sizeof(SCompData) + sizeof(SCompCol) * pCompBlock->numOfCols + sizeof(TSCKSUM); + int32_t tsize = sizeof(SCompData) + sizeof(SCompCol) * pCompBlock->numOfCols + sizeof(TSCKSUM); if (!taosCheckChecksumWhole((uint8_t *)pCompData, tsize)) goto _err; - for (int i = 0; i < pCompData->numOfCols; i++) { - // TODO: check the data checksum - // if (!taosCheckChecksumWhole()) - } - - ASSERT(pCompBlock->numOfCols == pCompData->numOfCols); pDataCols->numOfPoints = pCompBlock->numOfPoints; - int ccol = 0, dcol = 0; - while (true) { - if (ccol >= pDataCols->numOfCols) { - // TODO: Fill rest NULL - break; + // Recover the data + int ccol = 0; + int dcol = 0; + while (dcol < pDataCols->numOfCols) { + SDataCol *pDataCol = &(pDataCols->cols[dcol]); + if (ccol >= pCompData->numOfCols) { + // Set current column as NULL and forward + dataColSetNEleNull(pDataCol, pCompBlock->numOfPoints, pDataCols->maxPoints); + dcol++; + continue; } - if (dcol >= pCompData->numOfCols) break; SCompCol *pCompCol = &(pCompData->cols[ccol]); - SDataCol *pDataCol = &(pDataCols->cols[dcol]); if (pCompCol->colId == pDataCol->colId) { - // TODO: uncompress - memcpy(pDataCol->pData, (void *)(((char *)pCompData) + tsize + pCompCol->offset), pCompCol->len); + if (pCompBlock->algorithm == TWO_STAGE_COMP) { + pHelper->compBuffer = trealloc(pHelper->compBuffer, pCompCol->len + COMP_OVERFLOW_BYTES); + if (pHelper->compBuffer == NULL) goto _err; + } + if (tsdbCheckAndDecodeColumnData(pDataCol, (char *)pCompData + tsize + pCompCol->offset, pCompCol->len, + pCompBlock->algorithm, pCompBlock->numOfPoints, pDataCols->maxPoints, + pHelper->compBuffer, tsizeof(pHelper->compBuffer)) < 0) + goto _err; + dcol++; + ccol++; + } else if (pCompCol->colId < pDataCol->colId) { ccol++; - dcol++; - } else if (pCompCol->colId > pDataCol->colId) { - // TODO: Fill NULL - dcol++; } else { - ccol++; + // Set current column as NULL and forward + dataColSetNEleNull(pDataCol, pCompBlock->numOfPoints, pDataCols->maxPoints); + dcol++; } } - tfree(pCompData); return 0; _err: - tfree(pCompData); return -1; } @@ -634,36 +677,6 @@ _err: return -1; } -// static int tsdbCheckHelperCfg(SHelperCfg *pCfg) { -// // TODO -// return 0; -// } - -// static void tsdbClearHelperFile(SHelperFile *pHFile) { -// pHFile->fid = -1; -// if (pHFile->headF.fd > 0) { -// close(pHFile->headF.fd); -// pHFile->headF.fd = -1; -// } -// if (pHFile->dataF.fd > 0) { -// close(pHFile->dataF.fd); -// pHFile->dataF.fd = -1; -// } -// if (pHFile->lastF.fd > 0) { -// close(pHFile->lastF.fd); -// pHFile->lastF.fd = -1; -// } -// if (pHFile->nHeadF.fd > 0) { -// close(pHFile->nHeadF.fd); -// pHFile->nHeadF.fd = -1; -// } -// if (pHFile->nLastF.fd > 0) { -// close(pHFile->nLastF.fd); -// pHFile->nLastF.fd = -1; -// } - -// } - static bool tsdbShouldCreateNewLast(SRWHelper *pHelper) { ASSERT(pHelper->files.lastF.fd > 0); struct stat st; @@ -677,81 +690,94 @@ static int tsdbWriteBlockToFile(SRWHelper *pHelper, SFile *pFile, SDataCols *pDa ASSERT(rowsToWrite > 0 && rowsToWrite <= pDataCols->numOfPoints && rowsToWrite <= pHelper->config.maxRowsPerFileBlock); - SCompData *pCompData = NULL; + SCompData *pCompData = (SCompData *)(pHelper->blockBuffer); int64_t offset = 0; offset = lseek(pFile->fd, 0, SEEK_END); if (offset < 0) goto _err; - pCompData = (SCompData *)malloc(sizeof(SCompData) + sizeof(SCompCol) * pDataCols->numOfCols + sizeof(TSCKSUM)); - if (pCompData == NULL) goto _err; - int nColsNotAllNull = 0; - int32_t toffset = 0; for (int ncol = 0; ncol < pDataCols->numOfCols; ncol++) { SDataCol *pDataCol = pDataCols->cols + ncol; SCompCol *pCompCol = pCompData->cols + nColsNotAllNull; - if (0) { - // TODO: all data to commit are NULL + if (isNEleNull(pDataCol, rowsToWrite)) { + // all data to commit are NULL, just ignore it continue; } - // Compress the data here - { - // TODO - } - pCompCol->colId = pDataCol->colId; pCompCol->type = pDataCol->type; - pCompCol->len = TYPE_BYTES[pCompCol->type] * rowsToWrite; // TODO: change it - pCompCol->offset = toffset; nColsNotAllNull++; - - toffset += pCompCol->len; } ASSERT(nColsNotAllNull > 0 && nColsNotAllNull <= pDataCols->numOfCols); + // Compress the data if neccessary + int tcol = 0; + int32_t toffset = 0; + int32_t tsize = sizeof(SCompData) + sizeof(SCompCol) * nColsNotAllNull + sizeof(TSCKSUM); + int32_t lsize = tsize; + for (int ncol = 0; ncol < pDataCols->numOfCols; ncol++) { + if (tcol >= nColsNotAllNull) break; + + SDataCol *pDataCol = pDataCols->cols + ncol; + SCompCol *pCompCol = pCompData->cols + tcol; + + if (pDataCol->colId != pCompCol->colId) continue; + void *tptr = (void *)((char *)pCompData + lsize); + + pCompCol->offset = toffset; + + int32_t tlen = dataColGetNEleLen(pDataCol, rowsToWrite); + + if (pHelper->config.compress) { + if (pHelper->config.compress == TWO_STAGE_COMP) { + pHelper->compBuffer = trealloc(pHelper->compBuffer, tlen + COMP_OVERFLOW_BYTES); + if (pHelper->compBuffer == NULL) goto _err; + } + + pCompCol->len = (*(tDataTypeDesc[pDataCol->type].compFunc))( + (char *)pDataCol->pData, tlen, rowsToWrite, tptr, tsizeof(pHelper->blockBuffer) - lsize, + pHelper->config.compress, pHelper->compBuffer, tsizeof(pHelper->compBuffer)); + } else { + pCompCol->len = tlen; + memcpy(tptr, pDataCol->pData, pCompCol->len); + } + + // Add checksum + pCompCol->len += sizeof(TSCKSUM); + taosCalcChecksumAppend(0, (uint8_t *)tptr, pCompCol->len); + + toffset += pCompCol->len; + lsize += pCompCol->len; + tcol++; + } + pCompData->delimiter = TSDB_FILE_DELIMITER; pCompData->uid = pHelper->tableInfo.uid; pCompData->numOfCols = nColsNotAllNull; - // Write SCompData + SCompCol part - size_t tsize = sizeof(SCompData) + sizeof(SCompCol) * nColsNotAllNull + sizeof(TSCKSUM); taosCalcChecksumAppend(0, (uint8_t *)pCompData, tsize); - if (twrite(pFile->fd, (void *)pCompData, tsize) < tsize) goto _err; - // Write true data part - int nCompCol = 0; - for (int ncol = 0; ncol < pDataCols->numOfCols; ncol++) { - ASSERT(nCompCol < nColsNotAllNull); - SDataCol *pDataCol = pDataCols->cols + ncol; - SCompCol *pCompCol = pCompData->cols + nCompCol; - - if (pDataCol->colId == pCompCol->colId) { - if (twrite(pFile->fd, (void *)(pDataCol->pData), pCompCol->len) < pCompCol->len) goto _err; - tsize += pCompCol->len; - nCompCol++; - } - } + // Write the whole block to file + if (twrite(pFile->fd, (void *)pCompData, lsize) < lsize) goto _err; + // Update pCompBlock membership vairables pCompBlock->last = isLast; pCompBlock->offset = offset; pCompBlock->algorithm = pHelper->config.compress; pCompBlock->numOfPoints = rowsToWrite; pCompBlock->sversion = pHelper->tableInfo.sversion; - pCompBlock->len = (int32_t)tsize; + pCompBlock->len = (int32_t)lsize; pCompBlock->numOfSubBlocks = isSuperBlock ? 1 : 0; pCompBlock->numOfCols = nColsNotAllNull; pCompBlock->keyFirst = dataColsKeyFirst(pDataCols); pCompBlock->keyLast = dataColsKeyAt(pDataCols, rowsToWrite - 1); - tfree(pCompData); return 0; _err: - tfree(pCompData); return -1; } @@ -782,7 +808,7 @@ static int tsdbMergeDataWithBlock(SRWHelper *pHelper, int blkIdx, SDataCols *pDa TSKEY keyFirst = dataColsKeyFirst(pDataCols); SCompIdx *pIdx = pHelper->pCompIdx + pHelper->tableInfo.tid; - ASSERT(blkIdx < pIdx->numOfSuperBlocks); + ASSERT(blkIdx < pIdx->numOfBlocks); // SCompBlock *pCompBlock = pHelper->pCompInfo->blocks + blkIdx; ASSERT(blockAtIdx(pHelper, blkIdx)->numOfSubBlocks >= 1); @@ -790,7 +816,7 @@ static int tsdbMergeDataWithBlock(SRWHelper *pHelper, int blkIdx, SDataCols *pDa // ASSERT(compareKeyBlock((void *)&keyFirst, (void *)pCompBlock) == 0); if (keyFirst > blockAtIdx(pHelper, blkIdx)->keyLast) { // Merge with the last block by append - ASSERT(blockAtIdx(pHelper, blkIdx)->numOfPoints < pHelper->config.minRowsPerFileBlock && blkIdx == pIdx->numOfSuperBlocks-1); + ASSERT(blockAtIdx(pHelper, blkIdx)->numOfPoints < pHelper->config.minRowsPerFileBlock && blkIdx == pIdx->numOfBlocks-1); int defaultRowsToWrite = pHelper->config.maxRowsPerFileBlock * 4 / 5; // TODO: make a interface rowsWritten = MIN((defaultRowsToWrite - blockAtIdx(pHelper, blkIdx)->numOfPoints), pDataCols->numOfPoints); @@ -961,7 +987,7 @@ static int tsdbAdjustInfoSizeIfNeeded(SRWHelper *pHelper, size_t esize) { static int tsdbInsertSuperBlock(SRWHelper *pHelper, SCompBlock *pCompBlock, int blkIdx) { SCompIdx *pIdx = pHelper->pCompIdx + pHelper->tableInfo.tid; - ASSERT(blkIdx >= 0 && blkIdx <= pIdx->numOfSuperBlocks); + ASSERT(blkIdx >= 0 && blkIdx <= pIdx->numOfBlocks); ASSERT(pCompBlock->numOfSubBlocks == 1); // Adjust memory if no more room @@ -1004,7 +1030,7 @@ static int tsdbAddSubBlock(SRWHelper *pHelper, SCompBlock *pCompBlock, int blkId ASSERT(pCompBlock->numOfSubBlocks == 0); SCompIdx *pIdx = pHelper->pCompIdx + pHelper->tableInfo.tid; - ASSERT(blkIdx >= 0 && blkIdx < pIdx->numOfSuperBlocks); + ASSERT(blkIdx >= 0 && blkIdx < pIdx->numOfBlocks); SCompBlock *pSCompBlock = pHelper->pCompInfo->blocks + blkIdx; ASSERT(pSCompBlock->numOfSubBlocks >= 1 && pSCompBlock->numOfSubBlocks < TSDB_MAX_SUBBLOCKS); @@ -1088,7 +1114,7 @@ static int tsdbUpdateSuperBlock(SRWHelper *pHelper, SCompBlock *pCompBlock, int SCompIdx *pIdx = pHelper->pCompIdx + pHelper->tableInfo.tid; - ASSERT(blkIdx >= 0 && blkIdx < pIdx->numOfSuperBlocks); + ASSERT(blkIdx >= 0 && blkIdx < pIdx->numOfBlocks); SCompBlock *pSCompBlock = pHelper->pCompInfo->blocks + blkIdx; diff --git a/src/tsdb/tests/tsdbTests.cpp b/src/tsdb/tests/tsdbTests.cpp index 84711b07f8..c7ed6fcae1 100644 --- a/src/tsdb/tests/tsdbTests.cpp +++ b/src/tsdb/tests/tsdbTests.cpp @@ -27,7 +27,7 @@ typedef struct { static int insertData(SInsertInfo *pInfo) { SSubmitMsg *pMsg = - (SSubmitMsg *)malloc(sizeof(SSubmitMsg) + sizeof(SSubmitBlk) + tdMaxRowBytesFromSchema(pInfo->pSchema) * pInfo->rowsPerSubmit); + (SSubmitMsg *)malloc(sizeof(SSubmitMsg) + sizeof(SSubmitBlk) + dataRowMaxBytesFromSchema(pInfo->pSchema) * pInfo->rowsPerSubmit); if (pMsg == NULL) return -1; TSKEY start_time = pInfo->startTime; @@ -52,11 +52,12 @@ static int insertData(SInsertInfo *pInfo) { tdInitDataRow(row, pInfo->pSchema); for (int j = 0; j < schemaNCols(pInfo->pSchema); j++) { + STColumn *pTCol = schemaColAt(pInfo->pSchema, j); if (j == 0) { // Just for timestamp - tdAppendColVal(row, (void *)(&start_time), schemaColAt(pInfo->pSchema, j)); + tdAppendColVal(row, (void *)(&start_time), pTCol->type, pTCol->bytes, pTCol->offset); } else { // For int int val = 10; - tdAppendColVal(row, (void *)(&val), schemaColAt(pInfo->pSchema, j)); + tdAppendColVal(row, (void *)(&val), pTCol->type, pTCol->bytes, pTCol->offset); } } pBlock->len += dataRowLen(row); @@ -105,9 +106,9 @@ TEST(TsdbTest, DISABLED_tableEncodeDecode) { for (int i = 0; i < nCols; i++) { if (i == 0) { - tdSchemaAppendCol(schema, TSDB_DATA_TYPE_TIMESTAMP, i, -1); + tdSchemaAddCol(schema, TSDB_DATA_TYPE_TIMESTAMP, i, -1); } else { - tdSchemaAppendCol(schema, TSDB_DATA_TYPE_INT, i, -1); + tdSchemaAddCol(schema, TSDB_DATA_TYPE_INT, i, -1); } } @@ -149,9 +150,9 @@ TEST(TsdbTest, createRepo) { for (int i = 0; i < nCols; i++) { if (i == 0) { - tdSchemaAppendCol(schema, TSDB_DATA_TYPE_TIMESTAMP, i, -1); + tdSchemaAddCol(schema, TSDB_DATA_TYPE_TIMESTAMP, i, -1); } else { - tdSchemaAppendCol(schema, TSDB_DATA_TYPE_INT, i, -1); + tdSchemaAddCol(schema, TSDB_DATA_TYPE_INT, i, -1); } } @@ -244,7 +245,7 @@ TEST(TsdbTest, DISABLED_openRepo) { // tsdbLoadCompCols(&pGroup->files[TSDB_FILE_TYPE_DATA], pBlock, (void *)pCompData); // STable *pTable = tsdbGetTableByUid(pRepo->tsdbMeta, pCompData->uid); - // SDataCols *pDataCols = tdNewDataCols(tdMaxRowBytesFromSchema(tsdbGetTableSchema(pRepo->tsdbMeta, pTable)), 5, 10); + // SDataCols *pDataCols = tdNewDataCols(tdMaxRowBytesFromSchema(tsdbGetTableSchema(pRepo->tsdbMeta, pTable)), 5); // tdInitDataCols(pDataCols, tsdbGetTableSchema(pRepo->tsdbMeta, pTable)); // tsdbLoadDataBlock(&pGroup->files[TSDB_FILE_TYPE_DATA], pBlock, 1, pDataCols, pCompData); diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index a80e81f09f..d4350fc8b2 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -11,7 +11,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/lz4/inc) AUX_SOURCE_DIRECTORY(src SRC) ADD_LIBRARY(tutil ${SRC}) - TARGET_LINK_LIBRARIES(tutil pthread os m rt) + TARGET_LINK_LIBRARIES(tutil pthread os m rt lz4) FIND_PATH(ICONV_INCLUDE_EXIST iconv.h /usr/include/ /usr/local/include/) IF (ICONV_INCLUDE_EXIST) ADD_DEFINITIONS(-DUSE_LIBICONV) @@ -68,7 +68,7 @@ ELSEIF (TD_WINDOWS_64) LIST(APPEND SRC ./src/tutil.c) LIST(APPEND SRC ./src/version.c) ADD_LIBRARY(tutil ${SRC}) - TARGET_LINK_LIBRARIES(tutil iconv regex pthread os winmm IPHLPAPI ws2_32) + TARGET_LINK_LIBRARIES(tutil iconv regex pthread os winmm IPHLPAPI ws2_32 lz4) ELSEIF(TD_DARWIN_64) ADD_DEFINITIONS(-DUSE_LIBICONV) LIST(APPEND SRC ./src/hash.c) @@ -105,7 +105,7 @@ ELSEIF(TD_DARWIN_64) LIST(APPEND SRC ./src/version.c) LIST(APPEND SRC ./src/hash.c) ADD_LIBRARY(tutil ${SRC}) - TARGET_LINK_LIBRARIES(tutil iconv pthread os) + TARGET_LINK_LIBRARIES(tutil iconv pthread os lz4) ENDIF() # TARGET_LINK_LIBRARIES(tutil mstorage) diff --git a/src/util/inc/tscompression.h b/src/util/inc/tscompression.h index 55e282296f..9398ff8243 100644 --- a/src/util/inc/tscompression.h +++ b/src/util/inc/tscompression.h @@ -21,7 +21,9 @@ extern "C" { #endif #include "taosdef.h" +#include "tutil.h" +#define COMP_OVERFLOW_BYTES 2 #define BITS_PER_BYTE 8 // Masks #define INT64MASK(_x) ((1ul << _x) - 1) @@ -32,43 +34,220 @@ extern "C" { #define ONE_STAGE_COMP 1 #define TWO_STAGE_COMP 2 -int tsCompressTinyint(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorithm, - char* const buffer, int bufferSize); -int tsCompressSmallint(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorith, - char* const buffer, int bufferSize); -int tsCompressInt(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorith, - char* const buffer, int bufferSize); -int tsCompressBigint(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorith, - char* const buffer, int bufferSize); -int tsCompressBool(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorithm, - char* const buffer, int bufferSize); -int tsCompressString(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorith, - char* const buffer, int bufferSize); -int tsCompressFloat(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorith, - char* const buffer, int bufferSize); -int tsCompressDouble(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorith, - char* const buffer, int bufferSize); -int tsCompressTimestamp(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorith, - char* const buffer, int bufferSize); +extern int tsCompressINTImp(const char *const input, const int nelements, char *const output, const char type); +extern int tsDecompressINTImp(const char *const input, const int nelements, char *const output, const char type); +extern int tsCompressBoolImp(const char *const input, const int nelements, char *const output); +extern int tsDecompressBoolImp(const char *const input, const int nelements, char *const output); +extern int tsCompressStringImp(const char *const input, int inputSize, char *const output, int outputSize); +extern int tsDecompressStringImp(const char *const input, int compressedSize, char *const output, int outputSize); +extern int tsCompressTimestampImp(const char *const input, const int nelements, char *const output); +extern int tsDecompressTimestampImp(const char *const input, const int nelements, char *const output); +extern int tsCompressDoubleImp(const char *const input, const int nelements, char *const output); +extern int tsDecompressDoubleImp(const char *const input, const int nelements, char *const output); +extern int tsCompressFloatImp(const char *const input, const int nelements, char *const output); +extern int tsDecompressFloatImp(const char *const input, const int nelements, char *const output); -int tsDecompressTinyint(const char* const input, int compressedSize, const int nelements, char* const output, - int outputSize, char algorithm, char* const buffer, int bufferSize); -int tsDecompressSmallint(const char* const input, int compressedSize, const int nelements, char* const output, - int outputSize, char algorithm, char* const buffer, int bufferSize); -int tsDecompressInt(const char* const input, int compressedSize, const int nelements, char* const output, int outputSize, - char algorithm, char* const buffer, int bufferSize); -int tsDecompressBigint(const char* const input, int compressedSize, const int nelements, char* const output, - int outputSize, char algorithm, char* const buffer, int bufferSize); -int tsDecompressBool(const char* const input, int compressedSize, const int nelements, char* const output, - int outputSize, char algorithm, char* const buffer, int bufferSize); -int tsDecompressString(const char* const input, int compressedSize, const int nelements, char* const output, - int outputSize, char algorithm, char* const buffer, int bufferSize); -int tsDecompressFloat(const char* const input, int compressedSize, const int nelements, char* const output, - int outputSize, char algorithm, char* const buffer, int bufferSize); -int tsDecompressDouble(const char* const input, int compressedSize, const int nelements, char* const output, - int outputSize, char algorith, char* const buffer, int bufferSize); -int tsDecompressTimestamp(const char* const input, int compressedSize, const int nelements, char* const output, - int outputSize, char algorithm, char* const buffer, int bufferSize); +static FORCE_INLINE int tsCompressTinyint(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, char algorithm, + char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_TINYINT); + } else if (algorithm == TWO_STAGE_COMP) { + int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_TINYINT); + return tsCompressStringImp(buffer, len, output, outputSize); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsDecompressTinyint(const char *const input, int compressedSize, const int nelements, char *const output, + int outputSize, char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_TINYINT); + } else if (algorithm == TWO_STAGE_COMP) { + tsDecompressStringImp(input, compressedSize, buffer, bufferSize); + return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_TINYINT); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsCompressSmallint(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, char algorithm, + char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_SMALLINT); + } else if (algorithm == TWO_STAGE_COMP) { + int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_SMALLINT); + return tsCompressStringImp(buffer, len, output, outputSize); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsDecompressSmallint(const char *const input, int compressedSize, const int nelements, char *const output, + int outputSize, char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_SMALLINT); + } else if (algorithm == TWO_STAGE_COMP) { + tsDecompressStringImp(input, compressedSize, buffer, bufferSize); + return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_SMALLINT); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsCompressInt(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, char algorithm, + char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_INT); + } else if (algorithm == TWO_STAGE_COMP) { + int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_INT); + return tsCompressStringImp(buffer, len, output, outputSize); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsDecompressInt(const char *const input, int compressedSize, const int nelements, char *const output, + int outputSize, char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_INT); + } else if (algorithm == TWO_STAGE_COMP) { + tsDecompressStringImp(input, compressedSize, buffer, bufferSize); + return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_INT); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsCompressBigint(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, + char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_BIGINT); + } else if (algorithm == TWO_STAGE_COMP) { + int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_BIGINT); + return tsCompressStringImp(buffer, len, output, outputSize); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsDecompressBigint(const char *const input, int compressedSize, const int nelements, char *const output, + int outputSize, char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_BIGINT); + } else if (algorithm == TWO_STAGE_COMP) { + tsDecompressStringImp(input, compressedSize, buffer, bufferSize); + return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_BIGINT); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsCompressBool(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, + char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsCompressBoolImp(input, nelements, output); + } else if (algorithm == TWO_STAGE_COMP) { + int len = tsCompressBoolImp(input, nelements, buffer); + return tsCompressStringImp(buffer, len, output, outputSize); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsDecompressBool(const char *const input, int compressedSize, const int nelements, char *const output, + int outputSize, char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsDecompressBoolImp(input, nelements, output); + } else if (algorithm == TWO_STAGE_COMP) { + tsDecompressStringImp(input, compressedSize, buffer, bufferSize); + return tsDecompressBoolImp(buffer, nelements, output); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsCompressString(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, + char algorithm, char *const buffer, int bufferSize) { + return tsCompressStringImp(input, inputSize, output, outputSize); +} + +static FORCE_INLINE int tsDecompressString(const char *const input, int compressedSize, const int nelements, char *const output, + int outputSize, char algorithm, char *const buffer, int bufferSize) { + return tsDecompressStringImp(input, compressedSize, output, outputSize); +} + +static FORCE_INLINE int tsCompressFloat(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, + char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsCompressFloatImp(input, nelements, output); + } else if (algorithm == TWO_STAGE_COMP) { + int len = tsCompressFloatImp(input, nelements, buffer); + return tsCompressStringImp(buffer, len, output, outputSize); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsDecompressFloat(const char *const input, int compressedSize, const int nelements, char *const output, + int outputSize, char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsDecompressFloatImp(input, nelements, output); + } else if (algorithm == TWO_STAGE_COMP) { + tsDecompressStringImp(input, compressedSize, buffer, bufferSize); + return tsDecompressFloatImp(buffer, nelements, output); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsCompressDouble(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, + char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsCompressDoubleImp(input, nelements, output); + } else if (algorithm == TWO_STAGE_COMP) { + int len = tsCompressDoubleImp(input, nelements, buffer); + return tsCompressStringImp(buffer, len, output, outputSize); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsDecompressDouble(const char *const input, int compressedSize, const int nelements, char *const output, + int outputSize, char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsDecompressDoubleImp(input, nelements, output); + } else if (algorithm == TWO_STAGE_COMP) { + tsDecompressStringImp(input, compressedSize, buffer, bufferSize); + return tsDecompressDoubleImp(buffer, nelements, output); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsCompressTimestamp(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, + char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsCompressTimestampImp(input, nelements, output); + } else if (algorithm == TWO_STAGE_COMP) { + int len = tsCompressTimestampImp(input, nelements, buffer); + return tsCompressStringImp(buffer, len, output, outputSize); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsDecompressTimestamp(const char *const input, int compressedSize, const int nelements, char *const output, + int outputSize, char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsDecompressTimestampImp(input, nelements, output); + } else if (algorithm == TWO_STAGE_COMP) { + tsDecompressStringImp(input, compressedSize, buffer, bufferSize); + return tsDecompressTimestampImp(buffer, nelements, output); + } else { + assert(0); + } +} #ifdef __cplusplus } diff --git a/src/util/inc/tsocket.h b/src/util/inc/tsocket.h index 9eb4c26464..309aa80ef6 100644 --- a/src/util/inc/tsocket.h +++ b/src/util/inc/tsocket.h @@ -20,44 +20,23 @@ extern "C" { #endif -#include -#include -#include -#include - -int taosNonblockwrite(int fd, char *ptr, int nbytes); - int taosReadn(int sock, char *buffer, int len); - int taosWriteMsg(int fd, void *ptr, int nbytes); - int taosReadMsg(int fd, void *ptr, int nbytes); +int taosNonblockwrite(int fd, char *ptr, int nbytes); +int taosCopyFds(int sfd, int dfd, int64_t len); +int taosSetNonblocking(int sock, int on); -int taosOpenUdpSocket(char *ip, uint16_t port); - -int taosOpenTcpClientSocket(char *ip, uint16_t port, char *localIp); - -int taosOpenTcpServerSocket(char *ip, uint16_t port); - -int taosKeepTcpAlive(int sockFd); - +int taosOpenUdpSocket(uint32_t localIp, uint16_t localPort); +int taosOpenTcpClientSocket(uint32_t ip, uint16_t port, uint32_t localIp); +int taosOpenTcpServerSocket(uint32_t ip, uint16_t port); +int taosKeepTcpAlive(int sockFd); void taosCloseTcpSocket(int sockFd); -int taosOpenUDServerSocket(char *ip, uint16_t port); - -int taosOpenUDClientSocket(char *ip, uint16_t port); - -int taosOpenRawSocket(char *ip); - -int taosCopyFds(int sfd, int dfd, int64_t len); - -int taosGetPublicIp(char *const ip); - -int taosGetPrivateIp(char *const ip); - -void tinet_ntoa(char *ipstr, unsigned int ip); - -int taosSetNonblocking(int sock, int on); +int taosGetFqdn(char *); +uint32_t taosGetIpFromFqdn(const char *); +void tinet_ntoa(char *ipstr, unsigned int ip); +uint32_t ip2uint(const char *const ip_addr); #ifdef __cplusplus } diff --git a/src/util/inc/tutil.h b/src/util/inc/tutil.h index cdcc639151..55f4496755 100644 --- a/src/util/inc/tutil.h +++ b/src/util/inc/tutil.h @@ -44,7 +44,10 @@ extern "C" { #define tclose(x) taosCloseSocket(x) -#ifdef ASSERTION +// Pointer p drift right by b bytes +#define POINTER_DRIFT(p, b) ((void *)((char *)(p) + (b))) + +#ifndef NDEBUG #define ASSERT(x) assert(x) #else #define ASSERT(x) diff --git a/src/util/src/hash.c b/src/util/src/hash.c index e0e13c1b22..37e8123170 100644 --- a/src/util/src/hash.c +++ b/src/util/src/hash.c @@ -521,6 +521,7 @@ SHashMutableIterator *taosHashCreateIter(SHashObj *pHashObj) { static SHashNode *getNextHashNode(SHashMutableIterator *pIter) { assert(pIter != NULL); + pIter->entryIndex++; while (pIter->entryIndex < pIter->pHashObj->capacity) { SHashEntry *pEntry = pIter->pHashObj->hashList[pIter->entryIndex]; if (pEntry->next == NULL) { @@ -540,7 +541,7 @@ bool taosHashIterNext(SHashMutableIterator *pIter) { } size_t size = taosHashGetSize(pIter->pHashObj); - if (size == 0 || pIter->num >= size) { + if (size == 0) { return false; } diff --git a/src/util/src/tcompression.c b/src/util/src/tcompression.c index 24a53b3fe4..e3b3d65052 100644 --- a/src/util/src/tcompression.c +++ b/src/util/src/tcompression.c @@ -56,223 +56,6 @@ const int TEST_NUMBER = 1; #define is_bigendian() ((*(char *)&TEST_NUMBER) == 0) #define SIMPLE8B_MAX_INT64 ((uint64_t)2305843009213693951L) -// Function declarations -int tsCompressINTImp(const char *const input, const int nelements, char *const output, const char type); -int tsDecompressINTImp(const char *const input, const int nelements, char *const output, const char type); -int tsCompressBoolImp(const char *const input, const int nelements, char *const output); -int tsDecompressBoolImp(const char *const input, const int nelements, char *const output); -int tsCompressStringImp(const char *const input, int inputSize, char *const output, int outputSize); -int tsDecompressStringImp(const char *const input, int compressedSize, char *const output, int outputSize); -int tsCompressTimestampImp(const char *const input, const int nelements, char *const output); -int tsDecompressTimestampImp(const char *const input, const int nelements, char *const output); -int tsCompressDoubleImp(const char *const input, const int nelements, char *const output); -int tsDecompressDoubleImp(const char *const input, const int nelements, char *const output); -int tsCompressFloatImp(const char *const input, const int nelements, char *const output); -int tsDecompressFloatImp(const char *const input, const int nelements, char *const output); - -/* ----------------------------------------------Compression function used by - * others ---------------------------------------------- */ -int tsCompressTinyint(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, char algorithm, - char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_TINYINT); - } else if (algorithm == TWO_STAGE_COMP) { - int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_TINYINT); - return tsCompressStringImp(buffer, len, output, outputSize); - } else { - assert(0); - } -} - -int tsDecompressTinyint(const char *const input, int compressedSize, const int nelements, char *const output, - int outputSize, char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_TINYINT); - } else if (algorithm == TWO_STAGE_COMP) { - tsDecompressStringImp(input, compressedSize, buffer, bufferSize); - return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_TINYINT); - } else { - assert(0); - } -} - -int tsCompressSmallint(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, char algorithm, - char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_SMALLINT); - } else if (algorithm == TWO_STAGE_COMP) { - int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_SMALLINT); - return tsCompressStringImp(buffer, len, output, outputSize); - } else { - assert(0); - } -} - -int tsDecompressSmallint(const char *const input, int compressedSize, const int nelements, char *const output, - int outputSize, char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_SMALLINT); - } else if (algorithm == TWO_STAGE_COMP) { - tsDecompressStringImp(input, compressedSize, buffer, bufferSize); - return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_SMALLINT); - } else { - assert(0); - } -} - -int tsCompressInt(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, char algorithm, - char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_INT); - } else if (algorithm == TWO_STAGE_COMP) { - int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_INT); - return tsCompressStringImp(buffer, len, output, outputSize); - } else { - assert(0); - } -} - -int tsDecompressInt(const char *const input, int compressedSize, const int nelements, char *const output, - int outputSize, char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_INT); - } else if (algorithm == TWO_STAGE_COMP) { - tsDecompressStringImp(input, compressedSize, buffer, bufferSize); - return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_INT); - } else { - assert(0); - } -} - -int tsCompressBigint(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, - char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_BIGINT); - } else if (algorithm == TWO_STAGE_COMP) { - int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_BIGINT); - return tsCompressStringImp(buffer, len, output, outputSize); - } else { - assert(0); - } -} - -int tsDecompressBigint(const char *const input, int compressedSize, const int nelements, char *const output, - int outputSize, char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_BIGINT); - } else if (algorithm == TWO_STAGE_COMP) { - tsDecompressStringImp(input, compressedSize, buffer, bufferSize); - return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_BIGINT); - } else { - assert(0); - } -} - -int tsCompressBool(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, - char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsCompressBoolImp(input, nelements, output); - } else if (algorithm == TWO_STAGE_COMP) { - int len = tsCompressBoolImp(input, nelements, buffer); - return tsCompressStringImp(buffer, len, output, outputSize); - } else { - assert(0); - } -} - -int tsDecompressBool(const char *const input, int compressedSize, const int nelements, char *const output, - int outputSize, char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsDecompressBoolImp(input, nelements, output); - } else if (algorithm == TWO_STAGE_COMP) { - tsDecompressStringImp(input, compressedSize, buffer, bufferSize); - return tsDecompressBoolImp(buffer, nelements, output); - } else { - assert(0); - } -} - -int tsCompressString(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, - char algorithm, char *const buffer, int bufferSize) { - return tsCompressStringImp(input, inputSize, output, outputSize); -} - -int tsDecompressString(const char *const input, int compressedSize, const int nelements, char *const output, - int outputSize, char algorithm, char *const buffer, int bufferSize) { - return tsDecompressStringImp(input, compressedSize, output, outputSize); -} - -int tsCompressFloat(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, - char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsCompressFloatImp(input, nelements, output); - } else if (algorithm == TWO_STAGE_COMP) { - int len = tsCompressFloatImp(input, nelements, buffer); - return tsCompressStringImp(buffer, len, output, outputSize); - } else { - assert(0); - } -} - -int tsDecompressFloat(const char *const input, int compressedSize, const int nelements, char *const output, - int outputSize, char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsDecompressFloatImp(input, nelements, output); - } else if (algorithm == TWO_STAGE_COMP) { - tsDecompressStringImp(input, compressedSize, buffer, bufferSize); - return tsDecompressFloatImp(buffer, nelements, output); - } else { - assert(0); - } -} -int tsCompressDouble(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, - char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsCompressDoubleImp(input, nelements, output); - } else if (algorithm == TWO_STAGE_COMP) { - int len = tsCompressDoubleImp(input, nelements, buffer); - return tsCompressStringImp(buffer, len, output, outputSize); - } else { - assert(0); - } -} - -int tsDecompressDouble(const char *const input, int compressedSize, const int nelements, char *const output, - int outputSize, char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsDecompressDoubleImp(input, nelements, output); - } else if (algorithm == TWO_STAGE_COMP) { - tsDecompressStringImp(input, compressedSize, buffer, bufferSize); - return tsDecompressDoubleImp(buffer, nelements, output); - } else { - assert(0); - } -} - -int tsCompressTimestamp(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, - char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsCompressTimestampImp(input, nelements, output); - } else if (algorithm == TWO_STAGE_COMP) { - int len = tsCompressTimestampImp(input, nelements, buffer); - return tsCompressStringImp(buffer, len, output, outputSize); - } else { - assert(0); - } -} - -int tsDecompressTimestamp(const char *const input, int compressedSize, const int nelements, char *const output, - int outputSize, char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsDecompressTimestampImp(input, nelements, output); - } else if (algorithm == TWO_STAGE_COMP) { - tsDecompressStringImp(input, compressedSize, buffer, bufferSize); - return tsDecompressTimestampImp(buffer, nelements, output); - } else { - assert(0); - } -} - bool safeInt64Add(int64_t a, int64_t b) { if ((a > 0 && b > INT64_MAX - a) || (a < 0 && b < INT64_MIN - a)) return false; return true; diff --git a/src/util/src/tconfig.c b/src/util/src/tconfig.c index 6101d4471b..dfbdc5e35d 100644 --- a/src/util/src/tconfig.c +++ b/src/util/src/tconfig.c @@ -249,7 +249,7 @@ void taosReadGlobalLogCfg() { } wordfree(&full_path); - taosReadLogOption("logDir", logDir); + taosReadLogOption("tsLogDir", tsLogDir); sprintf(fileName, "%s/taos.cfg", configDir); fp = fopen(fileName, "r"); diff --git a/src/util/src/tlog.c b/src/util/src/tlog.c index 64ccfbc9da..47521fc36e 100644 --- a/src/util/src/tlog.c +++ b/src/util/src/tlog.c @@ -66,7 +66,7 @@ int32_t tsAsyncLog = 1; float tsTotalLogDirGB = 0; float tsAvailLogDirGB = 0; float tsMinimalLogDirGB = 0.1; -char logDir[TSDB_FILENAME_LEN] = "/var/log/taos"; +char tsLogDir[TSDB_FILENAME_LEN] = "/var/log/taos"; static SLogObj tsLogObj = { .fileNum = 1 }; static void * taosAsyncOutputLog(void *param); @@ -298,7 +298,7 @@ static int32_t taosOpenLogFile(char *fn, int32_t maxLines, int32_t maxFileNum) { void taosPrintLog(const char *const flags, int32_t dflag, const char *const format, ...) { if (tsTotalLogDirGB != 0 && tsAvailLogDirGB < tsMinimalLogDirGB) { - printf("server disk:%s space remain %.3f GB, total %.1f GB, stop print log.\n", logDir, tsAvailLogDirGB, tsTotalLogDirGB); + printf("server disk:%s space remain %.3f GB, total %.1f GB, stop print log.\n", tsLogDir, tsAvailLogDirGB, tsTotalLogDirGB); fflush(stdout); return; } @@ -356,7 +356,7 @@ void taosPrintLog(const char *const flags, int32_t dflag, const char *const form void taosDumpData(unsigned char *msg, int32_t len) { if (tsTotalLogDirGB != 0 && tsAvailLogDirGB < tsMinimalLogDirGB) { - printf("server disk:%s space remain %.3f GB, total %.1f GB, stop dump log.\n", logDir, tsAvailLogDirGB, tsTotalLogDirGB); + printf("server disk:%s space remain %.3f GB, total %.1f GB, stop dump log.\n", tsLogDir, tsAvailLogDirGB, tsTotalLogDirGB); fflush(stdout); return; } @@ -385,7 +385,7 @@ void taosDumpData(unsigned char *msg, int32_t len) { void taosPrintLongString(const char *const flags, int32_t dflag, const char *const format, ...) { if (tsTotalLogDirGB != 0 && tsAvailLogDirGB < tsMinimalLogDirGB) { - printf("server disk:%s space remain %.3f GB, total %.1f GB, stop write log.\n", logDir, tsAvailLogDirGB, tsTotalLogDirGB); + printf("server disk:%s space remain %.3f GB, total %.1f GB, stop write log.\n", tsLogDir, tsAvailLogDirGB, tsTotalLogDirGB); fflush(stdout); return; } diff --git a/src/util/src/tnote.c b/src/util/src/tnote.c index 9e0f6597ae..91d586322d 100644 --- a/src/util/src/tnote.c +++ b/src/util/src/tnote.c @@ -27,10 +27,10 @@ void taosInitNote(int numOfNoteLines, int maxNotes, char* lable) if (strcasecmp(lable, "http_note") == 0) { pNote = &m_HttpNote; - sprintf(temp, "%s/httpnote", logDir); + sprintf(temp, "%s/httpnote", tsLogDir); } else if (strcasecmp(lable, "tsc_note") == 0) { pNote = &m_TscNote; - sprintf(temp, "%s/tscnote-%d", logDir, getpid()); + sprintf(temp, "%s/tscnote-%d", tsLogDir, getpid()); } else { return; } diff --git a/src/util/src/tsocket.c b/src/util/src/tsocket.c index 4d3687e50d..c665ef9679 100644 --- a/src/util/src/tsocket.c +++ b/src/util/src/tsocket.c @@ -14,92 +14,30 @@ */ #include "os.h" -#include "tglobal.h" #include "tulog.h" #include "tsocket.h" #include "tutil.h" -/* - * Function to get the public ip address of current machine. If get IP - * successfully, return 0, else, return -1. The return values is ip. - * - * Use: - * if (taosGetPublicIp(ip) != 0) { - * perror("Fail to get public IP address\n"); - * exit(EXIT_FAILURE); - * } - */ -int taosGetPublicIp(char *const ip) { - /* bool flag; */ - int flag; - int sock; - char ** pptr = NULL; - struct sockaddr_in destAddr; - struct hostent * ptr = NULL; - char destIP[128]; - char szBuffer[] = { - "GET / HTTP/1.1\nHost: ident.me\nUser-Agent: curl/7.47.0\nAccept: " - "*/*\n\n"}; - char res[1024]; +int taosGetFqdn(char *fqdn) { + char hostname[1024]; + hostname[1023] = '\0'; + gethostname(hostname, 1023); - // Create socket - sock = (int)socket(AF_INET, SOCK_STREAM, 0); - if (sock == -1) { + struct hostent* h; + h = gethostbyname(hostname); + if (h != NULL) { + strcpy(fqdn, h->h_name); + return 0; + } else { + uError("failed to get host name"); return -1; } +} - bzero((void *)&destAddr, sizeof(destAddr)); - destAddr.sin_family = AF_INET; - destAddr.sin_port = htons(80); - - ptr = gethostbyname("ident.me"); - if (ptr == NULL) { - return -1; - } - - // Loop to find a valid IP address - for (flag = 0, pptr = ptr->h_addr_list; NULL != *pptr; ++pptr) { - inet_ntop(ptr->h_addrtype, *pptr, destIP, sizeof(destIP)); - destAddr.sin_addr.s_addr = inet_addr(destIP); - if (connect(sock, (struct sockaddr *)&destAddr, sizeof(struct sockaddr)) != -1) { - flag = 1; - break; - } - } - - // Check if the host is available. - if (flag == 0) { - return -1; - } - - // Check send. - if (strlen(szBuffer) != taosWriteSocket(sock, szBuffer, (size_t)strlen(szBuffer))) { - return -1; - } - - // Receive response. - if (taosReadSocket(sock, res, 1024) == -1) { - return -1; - } - - // Extract the IP address from the response. - int c_start = 0, c_end = 0; - for (; c_start < (int)strlen(res); c_start = c_end + 1) { - for (c_end = c_start; c_end < (int)strlen(res) && res[c_end] != '\n'; c_end++) { - } - - if (c_end >= (int)strlen(res)) { - return -1; - } - - if (res[c_start] >= '0' && res[c_start] <= '9') { - strncpy(ip, res + c_start, (size_t)(c_end - c_start)); - ip[c_end - c_start] = '\0'; - break; - } - } - - return 0; +uint32_t taosGetIpFromFqdn(const char *fqdn) { + struct hostent * record = gethostbyname(fqdn); + if(record == NULL) return -1; + return ((struct in_addr *)record->h_addr)->s_addr; } // Function converting an IP address string to an unsigned int. @@ -259,7 +197,7 @@ int taosReadn(int fd, char *ptr, int nbytes) { return (nbytes - nleft); } -int taosOpenUdpSocket(char *ip, uint16_t port) { +int taosOpenUdpSocket(uint32_t ip, uint16_t port) { struct sockaddr_in localAddr; int sockFd; int ttl = 128; @@ -270,7 +208,7 @@ int taosOpenUdpSocket(char *ip, uint16_t port) { memset((char *)&localAddr, 0, sizeof(localAddr)); localAddr.sin_family = AF_INET; - localAddr.sin_addr.s_addr = inet_addr(ip); + localAddr.sin_addr.s_addr = ip; localAddr.sin_port = (uint16_t)htons(port); if ((sockFd = (int)socket(AF_INET, SOCK_DGRAM, 0)) < 0) { @@ -325,13 +263,11 @@ int taosOpenUdpSocket(char *ip, uint16_t port) { return sockFd; } -int taosOpenTcpClientSocket(char *destIp, uint16_t destPort, char *clientIp) { +int taosOpenTcpClientSocket(uint32_t destIp, uint16_t destPort, uint32_t clientIp) { int sockFd = 0; struct sockaddr_in serverAddr, clientAddr; int ret; - // uTrace("open tcp client socket:%s:%d, local Ip:%s", destIp, destPort, clientIp); - sockFd = (int)socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); if (sockFd < 0) { @@ -339,16 +275,16 @@ int taosOpenTcpClientSocket(char *destIp, uint16_t destPort, char *clientIp) { return -1; } - if (clientIp && clientIp[0] && clientIp[0] != '0') { + if ( clientIp != 0) { memset((char *)&clientAddr, 0, sizeof(clientAddr)); clientAddr.sin_family = AF_INET; - clientAddr.sin_addr.s_addr = inet_addr(clientIp); + clientAddr.sin_addr.s_addr = clientIp; clientAddr.sin_port = 0; /* bind socket to client address */ if (bind(sockFd, (struct sockaddr *)&clientAddr, sizeof(clientAddr)) < 0) { - uError("bind tcp client socket failed, client(%s:0), dest(%s:%d), reason:%d(%s)", - clientIp, destIp, destPort, errno, strerror(errno)); + uError("bind tcp client socket failed, client(0x%x:0), dest(0x%x:%d), reason:(%s)", + clientIp, destIp, destPort, strerror(errno)); close(sockFd); return -1; } @@ -356,13 +292,13 @@ int taosOpenTcpClientSocket(char *destIp, uint16_t destPort, char *clientIp) { memset((char *)&serverAddr, 0, sizeof(serverAddr)); serverAddr.sin_family = AF_INET; - serverAddr.sin_addr.s_addr = inet_addr(destIp); + serverAddr.sin_addr.s_addr = destIp; serverAddr.sin_port = (uint16_t)htons((uint16_t)destPort); ret = connect(sockFd, (struct sockaddr *)&serverAddr, sizeof(serverAddr)); if (ret != 0) { - //uError("failed to connect socket, ip:%s, port:%hu, reason: %s", destIp, destPort, strerror(errno)); + //uError("failed to connect socket, ip:0x%x, port:%hu(%s)", destIp, destPort, strerror(errno)); taosCloseSocket(sockFd); sockFd = -1; } @@ -420,7 +356,7 @@ int taosKeepTcpAlive(int sockFd) { return 0; } -int taosOpenTcpServerSocket(char *ip, uint16_t port) { +int taosOpenTcpServerSocket(uint32_t ip, uint16_t port) { struct sockaddr_in serverAdd; int sockFd; int reuse; @@ -429,7 +365,7 @@ int taosOpenTcpServerSocket(char *ip, uint16_t port) { bzero((char *)&serverAdd, sizeof(serverAdd)); serverAdd.sin_family = AF_INET; - serverAdd.sin_addr.s_addr = inet_addr(ip); + serverAdd.sin_addr.s_addr = ip; serverAdd.sin_port = (uint16_t)htons(port); if ((sockFd = (int)socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) { @@ -447,7 +383,7 @@ int taosOpenTcpServerSocket(char *ip, uint16_t port) { /* bind socket to server address */ if (bind(sockFd, (struct sockaddr *)&serverAdd, sizeof(serverAdd)) < 0) { - uError("bind tcp server socket failed, %s:%hu, reason:%d(%s)", ip, port, errno, strerror(errno)); + uError("bind tcp server socket failed, 0x%x:%hu(%s)", ip, port, strerror(errno)); close(sockFd); return -1; } @@ -455,45 +391,13 @@ int taosOpenTcpServerSocket(char *ip, uint16_t port) { if (taosKeepTcpAlive(sockFd) < 0) return -1; if (listen(sockFd, 10) < 0) { - uError("listen tcp server socket failed, %s:%hu, reason:%d(%s)", ip, port, errno, strerror(errno)); + uError("listen tcp server socket failed, 0x%x:%hu(%s)", ip, port, strerror(errno)); return -1; } return sockFd; } -int taosOpenRawSocket(char *ip) { - int fd, hold; - struct sockaddr_in rawAdd; - - uTrace("open udp raw socket:%s", ip); - - fd = (int)socket(AF_INET, SOCK_RAW, IPPROTO_UDP); - if (fd < 0) { - uError("failed to open raw socket: %d (%s)", errno, strerror(errno)); - return -1; - } - - hold = 1; - if (taosSetSockOpt(fd, IPPROTO_IP, IP_HDRINCL, (void *)&hold, sizeof(hold)) < 0) { - uError("failed to set hold option: %d (%s)", errno, strerror(errno)); - close(fd); - return -1; - } - - bzero((char *)&rawAdd, sizeof(rawAdd)); - rawAdd.sin_family = AF_INET; - rawAdd.sin_addr.s_addr = inet_addr(ip); - - if (bind(fd, (struct sockaddr *)&rawAdd, sizeof(rawAdd)) < 0) { - uError("failed to bind RAW socket: %d (%s)", errno, strerror(errno)); - close(fd); - return -1; - } - - return fd; -} - void tinet_ntoa(char *ipstr, unsigned int ip) { sprintf(ipstr, "%d.%d.%d.%d", ip & 0xFF, (ip >> 8) & 0xFF, (ip >> 16) & 0xFF, ip >> 24); } diff --git a/src/util/src/tutil.c b/src/util/src/tutil.c index 47d66a066e..707d6741f7 100644 --- a/src/util/src/tutil.c +++ b/src/util/src/tutil.c @@ -686,4 +686,4 @@ void taosRemoveDir(char *rootDir) { rmdir(rootDir); uPrint("dir:%s is removed", rootDir); -} \ No newline at end of file +} diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c index 9ae0588771..1302ceaff4 100644 --- a/src/vnode/src/vnodeMain.c +++ b/src/vnode/src/vnodeMain.c @@ -96,14 +96,16 @@ int32_t vnodeCreate(SMDCreateVnodeMsg *pVnodeCfg) { } STsdbCfg tsdbCfg = {0}; - tsdbCfg.precision = pVnodeCfg->cfg.precision; - tsdbCfg.compression = pVnodeCfg->cfg.compression;; tsdbCfg.tsdbId = pVnodeCfg->cfg.vgId; + tsdbCfg.cacheBlockSize = pVnodeCfg->cfg.cacheBlockSize; + tsdbCfg.totalBlocks = pVnodeCfg->cfg.totalBlocks; tsdbCfg.maxTables = pVnodeCfg->cfg.maxTables; tsdbCfg.daysPerFile = pVnodeCfg->cfg.daysPerFile; + tsdbCfg.keep = pVnodeCfg->cfg.daysToKeep; tsdbCfg.minRowsPerFileBlock = pVnodeCfg->cfg.minRowsPerFileBlock; tsdbCfg.maxRowsPerFileBlock = pVnodeCfg->cfg.maxRowsPerFileBlock; - tsdbCfg.keep = pVnodeCfg->cfg.daysToKeep; + tsdbCfg.precision = pVnodeCfg->cfg.precision; + tsdbCfg.compression = pVnodeCfg->cfg.compression;; char tsdbDir[TSDB_FILENAME_LEN] = {0}; sprintf(tsdbDir, "%s/vnode%d/tsdb", tsVnodeDir, pVnodeCfg->cfg.vgId); @@ -311,7 +313,7 @@ void *vnodeGetWqueue(int32_t vgId) { SVnodeObj *pVnode = vnodeAccquireVnode(vgId); if (pVnode == NULL) return NULL; return pVnode->wqueue; -} +} void *vnodeGetWal(void *pVnode) { return ((SVnodeObj *)pVnode)->wal; @@ -341,10 +343,13 @@ static void vnodeBuildVloadMsg(char *pNode, void * param) { } static void vnodeCleanUp(SVnodeObj *pVnode) { - taosDeleteIntHash(tsDnodeVnodesHash, pVnode->vgId); - //syncStop(pVnode->sync); + if (pVnode->sync) { + syncStop(pVnode->sync); + pVnode->sync = NULL; + } + tsdbCloseRepo(pVnode->tsdb); walClose(pVnode->wal); vnodeSaveVersion(pVnode); @@ -379,11 +384,11 @@ static int32_t vnodeSaveCfg(SMDCreateVnodeMsg *pVnodeCfg) { sprintf(cfgFile, "%s/vnode%d/config.json", tsVnodeDir, pVnodeCfg->cfg.vgId); FILE *fp = fopen(cfgFile, "w"); if (!fp) { - dError("vgId:%d, failed to open vnode cfg file for write, error:%s", pVnodeCfg->cfg.vgId, strerror(errno)); + dError("vgId:%d, failed to open vnode cfg file for write, file:%s error:%s", pVnodeCfg->cfg.vgId, cfgFile, + strerror(errno)); return errno; } - char ipStr[20]; int32_t len = 0; int32_t maxLen = 1000; char * content = calloc(1, maxLen + 1); @@ -408,19 +413,10 @@ static int32_t vnodeSaveCfg(SMDCreateVnodeMsg *pVnodeCfg) { len += snprintf(content + len, maxLen - len, " \"wals\": %d,\n", pVnodeCfg->cfg.wals); len += snprintf(content + len, maxLen - len, " \"quorum\": %d,\n", pVnodeCfg->cfg.quorum); - uint32_t ipInt = pVnodeCfg->cfg.arbitratorIp; - sprintf(ipStr, "%u.%u.%u.%u", ipInt & 0xFF, (ipInt >> 8) & 0xFF, (ipInt >> 16) & 0xFF, (uint8_t)(ipInt >> 24)); - len += snprintf(content + len, maxLen - len, " \"arbitratorIp\": \"%s\",\n", ipStr); - len += snprintf(content + len, maxLen - len, " \"nodeInfos\": [{\n"); for (int32_t i = 0; i < pVnodeCfg->cfg.replications; i++) { len += snprintf(content + len, maxLen - len, " \"nodeId\": %d,\n", pVnodeCfg->nodes[i].nodeId); - - uint32_t ipInt = pVnodeCfg->nodes[i].nodeIp; - sprintf(ipStr, "%u.%u.%u.%u", ipInt & 0xFF, (ipInt >> 8) & 0xFF, (ipInt >> 16) & 0xFF, (uint8_t)(ipInt >> 24)); - len += snprintf(content + len, maxLen - len, " \"nodeIp\": \"%s\",\n", ipStr); - - len += snprintf(content + len, maxLen - len, " \"nodeName\": \"%s\"\n", pVnodeCfg->nodes[i].nodeName); + len += snprintf(content + len, maxLen - len, " \"nodeEp\": \"%s\"\n", pVnodeCfg->nodes[i].nodeEp); if (i < pVnodeCfg->cfg.replications - 1) { len += snprintf(content + len, maxLen - len, " },{\n"); @@ -444,7 +440,8 @@ static int32_t vnodeReadCfg(SVnodeObj *pVnode) { sprintf(cfgFile, "%s/vnode%d/config.json", tsVnodeDir, pVnode->vgId); FILE *fp = fopen(cfgFile, "r"); if (!fp) { - dError("pVnode:%p vgId:%d, failed to open vnode cfg file for read, error:%s", pVnode, pVnode->vgId, strerror(errno)); + dError("pVnode:%p vgId:%d, failed to open vnode cfg file for read, file:%s, error:%s", pVnode, pVnode->vgId, + cfgFile, strerror(errno)); return errno; } @@ -585,13 +582,6 @@ static int32_t vnodeReadCfg(SVnodeObj *pVnode) { } pVnode->syncCfg.quorum = (int8_t)quorum->valueint; - cJSON *arbitratorIp = cJSON_GetObjectItem(root, "arbitratorIp"); - if (!arbitratorIp || arbitratorIp->type != cJSON_String || arbitratorIp->valuestring == NULL) { - dError("pVnode:%p vgId:%d, failed to read vnode cfg, arbitratorIp not found", pVnode, pVnode->vgId); - goto PARSE_OVER; - } - pVnode->syncCfg.arbitratorIp = inet_addr(arbitratorIp->valuestring); - cJSON *nodeInfos = cJSON_GetObjectItem(root, "nodeInfos"); if (!nodeInfos || nodeInfos->type != cJSON_Array) { dError("pVnode:%p vgId:%d, failed to read vnode cfg, nodeInfos not found", pVnode, pVnode->vgId); @@ -615,27 +605,22 @@ static int32_t vnodeReadCfg(SVnodeObj *pVnode) { } pVnode->syncCfg.nodeInfo[i].nodeId = nodeId->valueint; - cJSON *nodeIp = cJSON_GetObjectItem(nodeInfo, "nodeIp"); - if (!nodeIp || nodeIp->type != cJSON_String || nodeIp->valuestring == NULL) { - dError("pVnode:%p vgId:%d, failed to read vnode cfg, nodeIp not found", pVnode, pVnode->vgId); + cJSON *nodeEp = cJSON_GetObjectItem(nodeInfo, "nodeEp"); + if (!nodeEp || nodeEp->type != cJSON_String || nodeEp->valuestring == NULL) { + dError("pVnode:%p vgId:%d, failed to read vnode cfg, nodeFqdn not found", pVnode, pVnode->vgId); goto PARSE_OVER; } - pVnode->syncCfg.nodeInfo[i].nodeIp = inet_addr(nodeIp->valuestring); - cJSON *nodeName = cJSON_GetObjectItem(nodeInfo, "nodeName"); - if (!nodeName || nodeName->type != cJSON_String || nodeName->valuestring == NULL) { - dError("pVnode:%p vgId:%d, failed to read vnode cfg, nodeName not found", pVnode, pVnode->vgId); - goto PARSE_OVER; - } - strncpy(pVnode->syncCfg.nodeInfo[i].name, nodeName->valuestring, TSDB_NODE_NAME_LEN); + taosGetFqdnPortFromEp(nodeEp->valuestring, pVnode->syncCfg.nodeInfo[i].nodeFqdn, &pVnode->syncCfg.nodeInfo[i].nodePort); + pVnode->syncCfg.nodeInfo[i].nodePort += TSDB_PORT_SYNC; } ret = 0; dPrint("pVnode:%p vgId:%d, read vnode cfg successed, replcia:%d", pVnode, pVnode->vgId, pVnode->syncCfg.replica); for (int32_t i = 0; i < pVnode->syncCfg.replica; i++) { - dPrint("pVnode:%p vgId:%d, dnode:%d, ip:%s name:%s", pVnode, pVnode->vgId, pVnode->syncCfg.nodeInfo[i].nodeId, - taosIpStr(pVnode->syncCfg.nodeInfo[i].nodeIp), pVnode->syncCfg.nodeInfo[i].name); + dPrint("pVnode:%p vgId:%d, dnode:%d, %s:%d", pVnode, pVnode->vgId, pVnode->syncCfg.nodeInfo[i].nodeId, + pVnode->syncCfg.nodeInfo[i].nodeFqdn, pVnode->syncCfg.nodeInfo[i].nodePort); } PARSE_OVER: @@ -645,13 +630,13 @@ PARSE_OVER: return ret; } - static int32_t vnodeSaveVersion(SVnodeObj *pVnode) { char versionFile[TSDB_FILENAME_LEN + 30] = {0}; sprintf(versionFile, "%s/vnode%d/version.json", tsVnodeDir, pVnode->vgId); FILE *fp = fopen(versionFile, "w"); if (!fp) { - dError("pVnode:%p vgId:%d, failed to open vnode version file for write, error:%s", pVnode, pVnode->vgId, strerror(errno)); + dError("pVnode:%p vgId:%d, failed to open vnode version file for write, file:%s error:%s", pVnode, pVnode->vgId, + versionFile, strerror(errno)); return errno; } @@ -667,7 +652,7 @@ static int32_t vnodeSaveVersion(SVnodeObj *pVnode) { fclose(fp); free(content); - dPrint("pVnode:%p vgId:%d, save vnode version successed", pVnode, pVnode->vgId); + dPrint("pVnode:%p vgId:%d, save vnode version:%" PRId64 " successed", pVnode, pVnode->vgId, pVnode->version); return 0; } @@ -675,9 +660,10 @@ static int32_t vnodeSaveVersion(SVnodeObj *pVnode) { static bool vnodeReadVersion(SVnodeObj *pVnode) { char versionFile[TSDB_FILENAME_LEN + 30] = {0}; sprintf(versionFile, "%s/vnode%d/version.json", tsVnodeDir, pVnode->vgId); - FILE *fp = fopen(versionFile, "w"); + FILE *fp = fopen(versionFile, "r"); if (!fp) { - dError("pVnode:%p vgId:%d, failed to open vnode version file for write, error:%s", pVnode, pVnode->vgId, strerror(errno)); + dTrace("pVnode:%p vgId:%d, failed to open version file:%s error:%s", pVnode, pVnode->vgId, + versionFile, strerror(errno)); return false; } @@ -714,4 +700,4 @@ PARSE_OVER: cJSON_Delete(root); fclose(fp); return ret; -} \ No newline at end of file +} diff --git a/src/vnode/src/vnodeWrite.c b/src/vnode/src/vnodeWrite.c index cfcc9cd847..b1a49e6e65 100644 --- a/src/vnode/src/vnodeWrite.c +++ b/src/vnode/src/vnodeWrite.c @@ -123,7 +123,7 @@ static int32_t vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pCont, SRspRe STSchema *pDestSchema = tdNewSchema(numOfColumns); for (int i = 0; i < numOfColumns; i++) { - tdSchemaAppendCol(pDestSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes)); + tdSchemaAddCol(pDestSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes)); } tsdbTableSetSchema(&tCfg, pDestSchema, false); tsdbTableSetName(&tCfg, pTable->tableId, false); @@ -131,7 +131,7 @@ static int32_t vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pCont, SRspRe if (numOfTags != 0) { STSchema *pDestTagSchema = tdNewSchema(numOfTags); for (int i = numOfColumns; i < totalCols; i++) { - tdSchemaAppendCol(pDestTagSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes)); + tdSchemaAddCol(pDestTagSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes)); } tsdbTableSetTagSchema(&tCfg, pDestTagSchema, false); tsdbTableSetSName(&tCfg, pTable->superTableId, false); @@ -141,7 +141,8 @@ static int32_t vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pCont, SRspRe SDataRow dataRow = tdNewDataRowFromSchema(pDestTagSchema); for (int i = 0; i < numOfTags; i++) { - tdAppendColVal(dataRow, pTagData + accumBytes, pDestTagSchema->columns + i); + STColumn *pTCol = schemaColAt(pDestSchema, i); + tdAppendColVal(dataRow, pTagData + accumBytes, pTCol->type, pTCol->bytes, pTCol->offset); accumBytes += htons(pSchema[i + numOfColumns].bytes); } tsdbTableSetTagValue(&tCfg, dataRow, false); @@ -188,14 +189,14 @@ static int32_t vnodeProcessAlterTableMsg(SVnodeObj *pVnode, void *pCont, SRspRet STSchema *pDestSchema = tdNewSchema(numOfColumns); for (int i = 0; i < numOfColumns; i++) { - tdSchemaAppendCol(pDestSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes)); + tdSchemaAddCol(pDestSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes)); } tsdbTableSetSchema(&tCfg, pDestSchema, false); if (numOfTags != 0) { STSchema *pDestTagSchema = tdNewSchema(numOfTags); for (int i = numOfColumns; i < totalCols; i++) { - tdSchemaAppendCol(pDestTagSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes)); + tdSchemaAddCol(pDestTagSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes)); } tsdbTableSetTagSchema(&tCfg, pDestTagSchema, false); @@ -204,7 +205,8 @@ static int32_t vnodeProcessAlterTableMsg(SVnodeObj *pVnode, void *pCont, SRspRet SDataRow dataRow = tdNewDataRowFromSchema(pDestTagSchema); for (int i = 0; i < numOfTags; i++) { - tdAppendColVal(dataRow, pTagData + accumBytes, pDestTagSchema->columns + i); + STColumn *pTCol = schemaColAt(pDestTagSchema, i); + tdAppendColVal(dataRow, pTagData + accumBytes, pTCol->type, pTCol->bytes, pTCol->offset); accumBytes += htons(pSchema[i + numOfColumns].bytes); } tsdbTableSetTagValue(&tCfg, dataRow, false); diff --git a/tests/pytest/smoketest.sh b/tests/pytest/smoketest.sh index 71d19df5c0..af597fb6c5 100755 --- a/tests/pytest/smoketest.sh +++ b/tests/pytest/smoketest.sh @@ -23,6 +23,17 @@ sleep 1 python3 ./test.py $1 -f insert/tinyint.py python3 ./test.py -s $1 sleep 1 + +python3 ./test.py $1 -f table/column_name.py +python3 ./test.py -s $1 +sleep 1 +python3 ./test.py $1 -f table/column_num.py +python3 ./test.py -s $1 +sleep 1 +python3 ./test.py $1 -f table/db_table.py +python3 ./test.py -s $1 +sleep 1 + python3 ./test.py $1 -f import_merge/importDataLastTO.py python3 ./test.py -s $1 sleep 1 diff --git a/tests/pytest/table/column_name.py b/tests/pytest/table/column_name.py new file mode 100644 index 0000000000..6c945646d5 --- /dev/null +++ b/tests/pytest/table/column_name.py @@ -0,0 +1,181 @@ +# -*- coding: utf-8 -*- + +import sys +from util.log import * +from util.cases import * +from util.sql import * + + +class TDTestCase: + def init(self, conn): + tdLog.debug("start to execute %s" % __file__) + tdSql.init(conn.cursor()) + + def run(self): + tdSql.prepare() + + # TSIM: system sh/stop_dnodes.sh + # TSIM: + # TSIM: system sh/ip.sh -i 1 -s up + # TSIM: system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + # TSIM: system sh/cfg.sh -n dnode1 -c commitLog -v 0 + # TSIM: system sh/exec.sh -n dnode1 -s start + # TSIM: + # TSIM: sleep 3000 + # TSIM: sql connect + # TSIM: + # TSIM: $i = 0 + # TSIM: $dbPrefix = lm_cm_db + # TSIM: $tbPrefix = lm_cm_tb + # TSIM: $db = $dbPrefix . $i + # TSIM: $tb = $tbPrefix . $i + # TSIM: + # TSIM: print =============== step1 + tdLog.info('=============== step1') + # TSIM: sql create database $db + # TSIM: sql use $db + # TSIM: + # TSIM: sql drop table dd -x step0 + tdLog.info('drop table dd -x step0') + tdSql.error('drop table dd') + # TSIM: return -1 + # TSIM: step0: + # TSIM: + # TSIM: sql create table $tb(ts timestamp, int) -x step1 + tdLog.info('create table tb(ts timestamp, int) -x step1') + tdSql.error('create table tb(ts timestamp, int)') + # TSIM: return -1 + # TSIM: step1: + # TSIM: + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step2 + tdLog.info('=============== step2') + # TSIM: sql create table $tb (ts timestamp, s int) + tdLog.info('create table tb (ts timestamp, s int)') + tdSql.execute('create table tb (ts timestamp, s int)') + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 1 then + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: sql drop table $tb + tdLog.info('drop table tb') + tdSql.execute('drop table tb') + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step3 + tdLog.info('=============== step3') + # TSIM: sql create table $tb (ts timestamp, a0123456789 int) + tdLog.info('create table tb (ts timestamp, a0123456789 int)') + tdSql.execute('create table tb (ts timestamp, a0123456789 int)') + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 1 then + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: sql drop table $tb + tdLog.info('drop table tb') + tdSql.execute('drop table tb') + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step4 + tdLog.info('=============== step4') + # TSIM: sql create table $tb (ts timestamp, + # a0123456789012345678901234567890123456789 int) + tdLog.info( + 'create table tb (ts timestamp, a0123456789012345678901234567890123456789 int)') + tdSql.execute( + 'create table tb (ts timestamp, a0123456789012345678901234567890123456789 int)') + # TSIM: sql drop table $tb + tdLog.info('drop table tb') + tdSql.execute('drop table tb') + # TSIM: + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step5 + tdLog.info('=============== step5') + # TSIM: sql create table $tb (ts timestamp, a0123456789 int) + tdLog.info('create table tb (ts timestamp, a0123456789 int)') + tdSql.execute('create table tb (ts timestamp, a0123456789 int)') + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 1 then + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: sql insert into $tb values (now , 1) + tdLog.info("insert into tb values (now , 1)") + tdSql.execute("insert into tb values (now , 1)") + # TSIM: sql select * from $tb + tdLog.info('select * from tb') + tdSql.query('select * from tb') + # TSIM: if $rows != 1 then + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: sql drop database $db + tdLog.info('drop database db') + tdSql.execute('drop database db') + # TSIM: sql show databases + tdLog.info('show databases') + tdSql.query('show databases') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: + # TSIM: + # TSIM: +# convert end + + def stop(self): + tdSql.close() + tdLog.success("%s successfully executed" % __file__) + + +tdCases.addWindows(__file__, TDTestCase()) +tdCases.addLinux(__file__, TDTestCase()) diff --git a/tests/pytest/table/column_num.py b/tests/pytest/table/column_num.py new file mode 100644 index 0000000000..fca5b01ac2 --- /dev/null +++ b/tests/pytest/table/column_num.py @@ -0,0 +1,178 @@ +# -*- coding: utf-8 -*- + +import sys +from util.log import * +from util.cases import * +from util.sql import * + + +class TDTestCase: + def init(self, conn): + tdLog.debug("start to execute %s" % __file__) + tdSql.init(conn.cursor()) + + def run(self): + tdSql.prepare() + + # TSIM: system sh/stop_dnodes.sh + # TSIM: + # TSIM: system sh/ip.sh -i 1 -s up + # TSIM: system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + # TSIM: system sh/cfg.sh -n dnode1 -c commitLog -v 0 + # TSIM: system sh/exec.sh -n dnode1 -s start + # TSIM: + # TSIM: sleep 3000 + # TSIM: sql connect + # TSIM: + # TSIM: $i = 0 + # TSIM: $dbPrefix = lm_cn_db + # TSIM: $tbPrefix = lm_cn_tb + # TSIM: $db = $dbPrefix . $i + # TSIM: $tb = $tbPrefix . $i + # TSIM: + # TSIM: print =============== step1 + tdLog.info('=============== step1') + # TSIM: sql create database $db + # TSIM: sql use $db + # TSIM: + # TSIM: sql create table $tb() -x step1 + tdLog.info('create table tb() -x step1') + tdSql.error('create table tb()') + # TSIM: return -1 + # TSIM: step1: + # TSIM: + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step2 + tdLog.info('=============== step2') + # TSIM: sql create table $tb (ts timestamp) -x step2 + tdLog.info('create table tb (ts timestamp) -x step2') + tdSql.error('create table tb (ts timestamp) ') + # TSIM: return -1 + # TSIM: step2: + # TSIM: + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step3 + tdLog.info('=============== step3') + # TSIM: sql create table $tb (ts int) -x step3 + tdLog.info('create table tb (ts int) -x step3') + tdSql.error('create table tb (ts int) ') + # TSIM: return -1 + # TSIM: step3: + # TSIM: + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step4 + tdLog.info('=============== step4') + # TSIM: sql create table $tb (ts timestamp, a1 int, a2 int, a3 int, a4 + # int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 + # int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, + # a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 + # int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, + # b4 int, b5 int, b6 int, b7 int, b8 int, b9 int, b10 int, b11 int, b12 + # int, b13 int, b14 int, b15 int, b16 int, b17 int, b18 int, b19 int, + # b20 int, b21 int, b22 int, b23 int, b24 int, b25 int, b26 int, b27 + # int, b28 int,b29 int,b30 int,b31 int,b32 int) + tdLog.info('create table tb (ts timestamp, a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, b4 int, b5 int, b6 int, b7 int, b8 int, b9 int, b10 int, b11 int, b12 int, b13 int, b14 int, b15 int, b16 int, b17 int, b18 int, b19 int, b20 int, b21 int, b22 int, b23 int, b24 int, b25 int, b26 int, b27 int, b28 int,b29 int,b30 int,b31 int,b32 int)') + tdSql.execute('create table tb (ts timestamp, a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, b4 int, b5 int, b6 int, b7 int, b8 int, b9 int, b10 int, b11 int, b12 int, b13 int, b14 int, b15 int, b16 int, b17 int, b18 int, b19 int, b20 int, b21 int, b22 int, b23 int, b24 int, b25 int, b26 int, b27 int, b28 int,b29 int,b30 int,b31 int,b32 int)') + # TSIM: + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 1 then + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step5 + tdLog.info('=============== step5') + # TSIM: $i = 1 + # TSIM: $tb = $tbPrefix . $i + # TSIM: + # TSIM: sql create table $tb (ts timestamp, a1 int, a2 int, a3 int, a4 + # int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 + # int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, + # a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 + # int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, + # b4 int, b5 int) + tdLog.info('create table tb1 (ts timestamp, a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, b4 int, b5 int)') + tdSql.execute('create table tb1 (ts timestamp, a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, b4 int, b5 int)') + # TSIM: + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 2 then + tdLog.info('tdSql.checkRow(2)') + tdSql.checkRows(2) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: sql insert into $tb values (now, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 + # , 9 , 10 , 11 , 12 , 13 , 14 , 15 , 16 , 17 , 18 , 19 , 20 , 21 , 22 + # , 23 , 24 , 25 ,26 , 27 ,28 ,29,30,31, 32, 33, 34, 35, 36, 37) + tdLog.info("insert into tb1 values (now, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 , 16 , 17 , 18 , 19 , 20 , 21 , 22 , 23 , 24 , 25 ,26 , 27 ,28 ,29,30,31, 32, 33, 34, 35, 36, 37)") + tdSql.execute("insert into tb1 values (now, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 , 16 , 17 , 18 , 19 , 20 , 21 , 22 , 23 , 24 , 25 ,26 , 27 ,28 ,29,30,31, 32, 33, 34, 35, 36, 37)") + # TSIM: sql select * from $tb + tdLog.info('select * from tb1') + tdSql.query('select * from tb1') + # TSIM: if $rows != 1 then + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: sql drop table $tb + tdLog.info('drop table tb1') + tdSql.execute('drop table tb1') + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 1 then + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: sql drop database $db + tdLog.info('drop database db') + tdSql.execute('drop database db') + # TSIM: sql show databases + tdLog.info('show databases') + tdSql.query('show databases') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi +# convert end + + def stop(self): + tdSql.close() + tdLog.success("%s successfully executed" % __file__) + + +tdCases.addWindows(__file__, TDTestCase()) +tdCases.addLinux(__file__, TDTestCase()) diff --git a/tests/pytest/table/db_table.py b/tests/pytest/table/db_table.py new file mode 100644 index 0000000000..d4a8568375 --- /dev/null +++ b/tests/pytest/table/db_table.py @@ -0,0 +1,49 @@ +# -*- coding: utf-8 -*- + +import sys +from util.log import * +from util.cases import * +from util.sql import * + + +class TDTestCase: + def init(self, conn): + tdLog.debug("start to execute %s" % __file__) + tdSql.init(conn.cursor()) + + def run(self): + tdSql.prepare() + + tdLog.info('=============== step1') + tdLog.info('=============== step2') + tdLog.info('create table tb (ts timestamp, speed int)') + tdSql.execute('create table tb (ts timestamp, speed int)') + tdLog.info('=============== step3') + tdLog.info("insert into tb values (now, 1)") + tdSql.execute("insert into tb values (now, 1)") + tdLog.info('=============== step4') + tdLog.info('select * from tb') + tdSql.query('select * from tb') + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + tdLog.info('tdSql.checkData(0, 1, 1)') + tdSql.checkData(0, 1, 1) + tdLog.info('=============== step5') + tdLog.info('describe tb') + tdSql.query('describe tb') + tdLog.info('=============== step6') + tdLog.info('drop database db') + tdSql.execute('drop database db') + tdLog.info('show databases') + tdSql.query('show databases') + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) +# convert end + + def stop(self): + tdSql.close() + tdLog.success("%s successfully executed" % __file__) + + +tdCases.addWindows(__file__, TDTestCase()) +tdCases.addLinux(__file__, TDTestCase()) diff --git a/tests/pytest/util/log.py b/tests/pytest/util/log.py index 97c8b2ef7f..bcd840999d 100644 --- a/tests/pytest/util/log.py +++ b/tests/pytest/util/log.py @@ -23,14 +23,14 @@ class TDLog: self.path = "" def info(self, info): - printf("%s %s" % (datetime.datetime.now(), info)) + print("%s %s" % (datetime.datetime.now(), info)) def sleep(self, sec): - printf("%s sleep %d seconds" % (datetime.datetime.now(), sec)) + print("%s sleep %d seconds" % (datetime.datetime.now(), sec)) time.sleep(sec) def debug(self, err): - printf("\033[1;36m%s %s\033[0m" % (datetime.datetime.now(), err)) + print("\033[1;36m%s %s\033[0m" % (datetime.datetime.now(), err)) def success(self, info): printf("\033[1;32m%s %s\033[0m" % (datetime.datetime.now(), info)) @@ -43,7 +43,7 @@ class TDLog: sys.exit(1) def printNoPrefix(self, info): - printf("\033[1;36m%s\033[0m" % (info)) + print("\033[1;36m%s\033[0m" % (info)) tdLog = TDLog() diff --git a/tests/script/basicSuite.sim b/tests/script/basicSuite.sim index aad021e3b5..c9c2023ffe 100644 --- a/tests/script/basicSuite.sim +++ b/tests/script/basicSuite.sim @@ -1,8 +1,28 @@ ################################# +run general/db/basic1.sim +run general/db/basic2.sim +run general/db/basic3.sim +run general/db/basic4.sim +run general/db/basic5.sim -run general/db/testSuite.sim -run general/insert/testSuite.sim -run general/table/testSuite.sim -run general/user/basicSuite.sim +run general/table/basic1.sim +run general/table/basic2.sim +run general/table/basic3.sim +run general/table/column_num.sim +run general/table/column_name.sim +run general/table/bigint.sim +run general/table/bool.sim +run general/table/double.sim +run general/table/float.sim +run general/table/int.sim +run general/table/smallint.sim +run general/table/tinyint.sim +run general/table/db.table.sim + +run general/user/basic1.sim +run general/user/pass_alter.sim +run general/user/pass_len.sim +run general/user/user_create.sim +run general/user/user_len.sim ################################## diff --git a/tests/script/general/agg/fill.sim b/tests/script/general/agg/fill.sim index 4056b9ef20..de579238b8 100644 --- a/tests/script/general/agg/fill.sim +++ b/tests/script/general/agg/fill.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/agg/stream.sim b/tests/script/general/agg/stream.sim index a024ad9b80..2217c39430 100644 --- a/tests/script/general/agg/stream.sim +++ b/tests/script/general/agg/stream.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 print ========== step1 diff --git a/tests/script/general/alter/cached_schema_after_alter.sim b/tests/script/general/alter/cached_schema_after_alter.sim index f9bac689fb..52507b1992 100644 --- a/tests/script/general/alter/cached_schema_after_alter.sim +++ b/tests/script/general/alter/cached_schema_after_alter.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/alter/count.sim b/tests/script/general/alter/count.sim index be76aaa1c1..1b77f997ac 100644 --- a/tests/script/general/alter/count.sim +++ b/tests/script/general/alter/count.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 diff --git a/tests/script/general/alter/import.sim b/tests/script/general/alter/import.sim index 0cf70c8549..7348cc919e 100644 --- a/tests/script/general/alter/import.sim +++ b/tests/script/general/alter/import.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 diff --git a/tests/script/general/alter/insert1.sim b/tests/script/general/alter/insert1.sim index c58dce0203..0daa9c6432 100644 --- a/tests/script/general/alter/insert1.sim +++ b/tests/script/general/alter/insert1.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/alter/insert2.sim b/tests/script/general/alter/insert2.sim index d749ddefb5..34f935a04b 100644 --- a/tests/script/general/alter/insert2.sim +++ b/tests/script/general/alter/insert2.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/alter/metrics.sim b/tests/script/general/alter/metrics.sim index a58d25c5be..defe8d0fc1 100644 --- a/tests/script/general/alter/metrics.sim +++ b/tests/script/general/alter/metrics.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/alter/table.sim b/tests/script/general/alter/table.sim index 6a0e62a0bf..34630f4805 100644 --- a/tests/script/general/alter/table.sim +++ b/tests/script/general/alter/table.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/cache/cache_balance.sim b/tests/script/general/cache/cache_balance.sim index 1bc7d83e73..b71e810234 100644 --- a/tests/script/general/cache/cache_balance.sim +++ b/tests/script/general/cache/cache_balance.sim @@ -1,8 +1,8 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/cache/new_metrics.sim b/tests/script/general/cache/new_metrics.sim index 6af54766b8..18335b6095 100644 --- a/tests/script/general/cache/new_metrics.sim +++ b/tests/script/general/cache/new_metrics.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10 diff --git a/tests/script/general/cache/new_stream.sim b/tests/script/general/cache/new_stream.sim index 38559cb936..23904a0210 100644 --- a/tests/script/general/cache/new_stream.sim +++ b/tests/script/general/cache/new_stream.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10 diff --git a/tests/script/general/cache/restart_metrics.sim b/tests/script/general/cache/restart_metrics.sim index f4a607bf55..67d02722e2 100644 --- a/tests/script/general/cache/restart_metrics.sim +++ b/tests/script/general/cache/restart_metrics.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10 @@ -47,7 +47,7 @@ endi print =============== step2 system sh/exec.sh -n dnode1 -s stop -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10 diff --git a/tests/script/general/cache/restart_stream.sim b/tests/script/general/cache/restart_stream.sim index 2f45f18737..b119dcf856 100644 --- a/tests/script/general/cache/restart_stream.sim +++ b/tests/script/general/cache/restart_stream.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 1 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 1 @@ -97,7 +97,7 @@ endi print =============== step4 system sh/exec.sh -n dnode1 -s stop -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 1 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 1 diff --git a/tests/script/general/cache/restart_table.sim b/tests/script/general/cache/restart_table.sim index d7c02116fd..c973293fdc 100644 --- a/tests/script/general/cache/restart_table.sim +++ b/tests/script/general/cache/restart_table.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10 @@ -35,7 +35,7 @@ endi print =============== step2 system sh/exec.sh -n dnode1 -s stop -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10 diff --git a/tests/script/general/column/commit.sim b/tests/script/general/column/commit.sim index 3bc5d4e06a..3a46cc73e8 100644 --- a/tests/script/general/column/commit.sim +++ b/tests/script/general/column/commit.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/column/metrics.sim b/tests/script/general/column/metrics.sim index 94f5e6bb8a..119ab0108c 100644 --- a/tests/script/general/column/metrics.sim +++ b/tests/script/general/column/metrics.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/column/stream.sim b/tests/script/general/column/stream.sim index 5ea04db04b..6972e34197 100644 --- a/tests/script/general/column/stream.sim +++ b/tests/script/general/column/stream.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 print ========== step1 diff --git a/tests/script/general/column/table.sim b/tests/script/general/column/table.sim index 85e11f43f4..e4f3bea466 100644 --- a/tests/script/general/column/table.sim +++ b/tests/script/general/column/table.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/compress/commitlog.sim b/tests/script/general/compress/commitlog.sim index 2323991044..fdadfdac73 100644 --- a/tests/script/general/compress/commitlog.sim +++ b/tests/script/general/compress/commitlog.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 1 system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024 system sh/cfg.sh -n dnode1 -c compression -v 1 diff --git a/tests/script/general/compress/compress.sim b/tests/script/general/compress/compress.sim index 93e807e2db..2d222ecbbe 100644 --- a/tests/script/general/compress/compress.sim +++ b/tests/script/general/compress/compress.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024 system sh/cfg.sh -n dnode1 -c compression -v 1 diff --git a/tests/script/general/compress/compress2.sim b/tests/script/general/compress/compress2.sim index e0053648e2..096875176e 100644 --- a/tests/script/general/compress/compress2.sim +++ b/tests/script/general/compress/compress2.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024 system sh/cfg.sh -n dnode1 -c compression -v 2 diff --git a/tests/script/general/compress/uncompress.sim b/tests/script/general/compress/uncompress.sim index 13b19300ac..a26627d5e3 100644 --- a/tests/script/general/compress/uncompress.sim +++ b/tests/script/general/compress/uncompress.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024 system sh/cfg.sh -n dnode1 -c compression -v 1 diff --git a/tests/script/general/compute/avg.sim b/tests/script/general/compute/avg.sim index 9afdce8b14..ccc996dccb 100644 --- a/tests/script/general/compute/avg.sim +++ b/tests/script/general/compute/avg.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/bottom.sim b/tests/script/general/compute/bottom.sim index 889191f468..988ce74a03 100644 --- a/tests/script/general/compute/bottom.sim +++ b/tests/script/general/compute/bottom.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/count.sim b/tests/script/general/compute/count.sim index ead4a34a63..e2c352ffd4 100644 --- a/tests/script/general/compute/count.sim +++ b/tests/script/general/compute/count.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/diff.sim b/tests/script/general/compute/diff.sim index 7581f6b4bd..bc5799db18 100644 --- a/tests/script/general/compute/diff.sim +++ b/tests/script/general/compute/diff.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/diff2.sim b/tests/script/general/compute/diff2.sim index 2c831fc5a3..ecd0666198 100644 --- a/tests/script/general/compute/diff2.sim +++ b/tests/script/general/compute/diff2.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/first.sim b/tests/script/general/compute/first.sim index 9d98b61c1c..947fcf5444 100644 --- a/tests/script/general/compute/first.sim +++ b/tests/script/general/compute/first.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/interval.sim b/tests/script/general/compute/interval.sim index 36df589be9..d4052a47a1 100644 --- a/tests/script/general/compute/interval.sim +++ b/tests/script/general/compute/interval.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/last.sim b/tests/script/general/compute/last.sim index ef851e973e..ffd4368949 100644 --- a/tests/script/general/compute/last.sim +++ b/tests/script/general/compute/last.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/leastsquare.sim b/tests/script/general/compute/leastsquare.sim index 1f9d7fa4a9..ccd6be0109 100644 --- a/tests/script/general/compute/leastsquare.sim +++ b/tests/script/general/compute/leastsquare.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/max.sim b/tests/script/general/compute/max.sim index f8692c467f..d7f80bfef0 100644 --- a/tests/script/general/compute/max.sim +++ b/tests/script/general/compute/max.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/min.sim b/tests/script/general/compute/min.sim index 5a3f4351d0..3c123ca967 100644 --- a/tests/script/general/compute/min.sim +++ b/tests/script/general/compute/min.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/compute/null.sim b/tests/script/general/compute/null.sim index 813d212636..784f9ba094 100644 --- a/tests/script/general/compute/null.sim +++ b/tests/script/general/compute/null.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/percentile.sim b/tests/script/general/compute/percentile.sim index 2b30d4689c..8a4086dd24 100644 --- a/tests/script/general/compute/percentile.sim +++ b/tests/script/general/compute/percentile.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/stddev.sim b/tests/script/general/compute/stddev.sim index b39caea7a2..53a1b9bc01 100644 --- a/tests/script/general/compute/stddev.sim +++ b/tests/script/general/compute/stddev.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/sum.sim b/tests/script/general/compute/sum.sim index e298eabf44..4e4e75bfe4 100644 --- a/tests/script/general/compute/sum.sim +++ b/tests/script/general/compute/sum.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/top.sim b/tests/script/general/compute/top.sim index d36f599b71..54d7699f27 100644 --- a/tests/script/general/compute/top.sim +++ b/tests/script/general/compute/top.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/db/backup/keep.sim b/tests/script/general/db/backup/keep.sim index c00665743c..671d77de8c 100644 --- a/tests/script/general/db/backup/keep.sim +++ b/tests/script/general/db/backup/keep.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/db/basic.sim b/tests/script/general/db/basic.sim index a3bd1ae505..9d56e1c5fb 100644 --- a/tests/script/general/db/basic.sim +++ b/tests/script/general/db/basic.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c tables -v 1000 diff --git a/tests/script/general/db/basic1.sim b/tests/script/general/db/basic1.sim index 094c1a6930..1fa6678ef8 100644 --- a/tests/script/general/db/basic1.sim +++ b/tests/script/general/db/basic1.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/db/basic2.sim b/tests/script/general/db/basic2.sim index a1e4533707..945481d9bf 100644 --- a/tests/script/general/db/basic2.sim +++ b/tests/script/general/db/basic2.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/db/basic3.sim b/tests/script/general/db/basic3.sim index 60ff4b74c7..00e3e9d106 100644 --- a/tests/script/general/db/basic3.sim +++ b/tests/script/general/db/basic3.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/db/basic4.sim b/tests/script/general/db/basic4.sim index deac9d47b4..9f8d463a7d 100644 --- a/tests/script/general/db/basic4.sim +++ b/tests/script/general/db/basic4.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/db/basic5.sim b/tests/script/general/db/basic5.sim index 55a42899ec..09ace39bf4 100644 --- a/tests/script/general/db/basic5.sim +++ b/tests/script/general/db/basic5.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/db/delete_reuse1.sim b/tests/script/general/db/delete_reuse1.sim index 55ed7a1f5c..6e21aabb3c 100644 --- a/tests/script/general/db/delete_reuse1.sim +++ b/tests/script/general/db/delete_reuse1.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/db/delete_reuse2.sim b/tests/script/general/db/delete_reuse2.sim index 3014bd4d20..95aa3f9526 100644 --- a/tests/script/general/db/delete_reuse2.sim +++ b/tests/script/general/db/delete_reuse2.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/db/delete_reusevnode.sim b/tests/script/general/db/delete_reusevnode.sim index b8a268d5bb..2204e7434f 100644 --- a/tests/script/general/db/delete_reusevnode.sim +++ b/tests/script/general/db/delete_reusevnode.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10 @@ -45,8 +45,8 @@ endi system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10 diff --git a/tests/script/general/db/delete_reusevnode2.sim b/tests/script/general/db/delete_reusevnode2.sim index f261b3d1e2..dcf74a287d 100644 --- a/tests/script/general/db/delete_reusevnode2.sim +++ b/tests/script/general/db/delete_reusevnode2.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10 diff --git a/tests/script/general/db/delete_writing1.sim b/tests/script/general/db/delete_writing1.sim index e06371266f..a4be57782e 100644 --- a/tests/script/general/db/delete_writing1.sim +++ b/tests/script/general/db/delete_writing1.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/db/delete_writing2.sim b/tests/script/general/db/delete_writing2.sim index 751cc26b2f..75603dcdd8 100644 --- a/tests/script/general/db/delete_writing2.sim +++ b/tests/script/general/db/delete_writing2.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 diff --git a/tests/script/general/db/len.sim b/tests/script/general/db/len.sim index 5e4a891dc2..1cee902c1a 100644 --- a/tests/script/general/db/len.sim +++ b/tests/script/general/db/len.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000 diff --git a/tests/script/general/db/repeat.sim b/tests/script/general/db/repeat.sim index e008d95377..7afa42f0c4 100644 --- a/tests/script/general/db/repeat.sim +++ b/tests/script/general/db/repeat.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c tables -v 4 diff --git a/tests/script/general/db/tables.sim b/tests/script/general/db/tables.sim index aed8621116..afa11d6542 100644 --- a/tests/script/general/db/tables.sim +++ b/tests/script/general/db/tables.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000 diff --git a/tests/script/general/field/2.sim b/tests/script/general/field/2.sim index c2d9d78085..d5a002932e 100644 --- a/tests/script/general/field/2.sim +++ b/tests/script/general/field/2.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/3.sim b/tests/script/general/field/3.sim index 13f4c14f7b..ed4df854ad 100644 --- a/tests/script/general/field/3.sim +++ b/tests/script/general/field/3.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/4.sim b/tests/script/general/field/4.sim index aa8fb822a4..465df43f04 100644 --- a/tests/script/general/field/4.sim +++ b/tests/script/general/field/4.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/5.sim b/tests/script/general/field/5.sim index 9fa08cb799..e1e3d9a54a 100644 --- a/tests/script/general/field/5.sim +++ b/tests/script/general/field/5.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/6.sim b/tests/script/general/field/6.sim index b2ced5b9df..72e4b5bf4c 100644 --- a/tests/script/general/field/6.sim +++ b/tests/script/general/field/6.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/bigint.sim b/tests/script/general/field/bigint.sim index 2093f55de5..2adde6cd3d 100644 --- a/tests/script/general/field/bigint.sim +++ b/tests/script/general/field/bigint.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/binary.sim b/tests/script/general/field/binary.sim index a49af37806..1e1a3682b1 100644 --- a/tests/script/general/field/binary.sim +++ b/tests/script/general/field/binary.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/bool.sim b/tests/script/general/field/bool.sim index aa70dbd23e..41770a399d 100644 --- a/tests/script/general/field/bool.sim +++ b/tests/script/general/field/bool.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/double.sim b/tests/script/general/field/double.sim index daca74fcde..bf3aa923fd 100644 --- a/tests/script/general/field/double.sim +++ b/tests/script/general/field/double.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/float.sim b/tests/script/general/field/float.sim index 8bdebd6714..8e8c3740a8 100644 --- a/tests/script/general/field/float.sim +++ b/tests/script/general/field/float.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/int.sim b/tests/script/general/field/int.sim index a3d4c901eb..a4778279a1 100644 --- a/tests/script/general/field/int.sim +++ b/tests/script/general/field/int.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/single.sim b/tests/script/general/field/single.sim index ad844da95d..17492123ed 100644 --- a/tests/script/general/field/single.sim +++ b/tests/script/general/field/single.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/smallint.sim b/tests/script/general/field/smallint.sim index 432d766ac2..7b6ea2ce79 100644 --- a/tests/script/general/field/smallint.sim +++ b/tests/script/general/field/smallint.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/tinyint.sim b/tests/script/general/field/tinyint.sim index 9b143e061f..fe6e14f04a 100644 --- a/tests/script/general/field/tinyint.sim +++ b/tests/script/general/field/tinyint.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/http/grafana.sim b/tests/script/general/http/grafana.sim index 818114f9d7..4f83accf2d 100644 --- a/tests/script/general/http/grafana.sim +++ b/tests/script/general/http/grafana.sim @@ -2,8 +2,8 @@ system sh/stop_dnodes.sh sleep 5000 -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 #system sh/cfg.sh -n dnode1 -c adminRowLimit -v 10 system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135 diff --git a/tests/script/general/http/grafana_bug.sim b/tests/script/general/http/grafana_bug.sim index 6f0e687fda..ac6de5cb31 100644 --- a/tests/script/general/http/grafana_bug.sim +++ b/tests/script/general/http/grafana_bug.sim @@ -2,8 +2,8 @@ system sh/stop_dnodes.sh sleep 2000 -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 #system sh/cfg.sh -n dnode1 -c adminRowLimit -v 10 system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135 diff --git a/tests/script/general/http/prepare.sim b/tests/script/general/http/prepare.sim index dcbaa7ef81..11834e1223 100644 --- a/tests/script/general/http/prepare.sim +++ b/tests/script/general/http/prepare.sim @@ -2,8 +2,8 @@ system sh/stop_dnodes.sh sleep 5000 -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/http/restful.sim b/tests/script/general/http/restful.sim index 50f0223804..7cc48bcb7a 100644 --- a/tests/script/general/http/restful.sim +++ b/tests/script/general/http/restful.sim @@ -2,8 +2,8 @@ system sh/stop_dnodes.sh sleep 5000 -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/http/restful_full.sim b/tests/script/general/http/restful_full.sim index b42f440068..27f2a06253 100644 --- a/tests/script/general/http/restful_full.sim +++ b/tests/script/general/http/restful_full.sim @@ -2,8 +2,8 @@ system sh/stop_dnodes.sh #sleep 5000 -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/http/restful_insert.sim b/tests/script/general/http/restful_insert.sim index e131e3e53e..5a032b0dbe 100644 --- a/tests/script/general/http/restful_insert.sim +++ b/tests/script/general/http/restful_insert.sim @@ -2,8 +2,8 @@ system sh/stop_dnodes.sh sleep 5000 -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/http/restful_limit.sim b/tests/script/general/http/restful_limit.sim index 75d83b61b3..190d63f4db 100644 --- a/tests/script/general/http/restful_limit.sim +++ b/tests/script/general/http/restful_limit.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/http/telegraf.sim b/tests/script/general/http/telegraf.sim index b782a9b9bf..16bea1ac4b 100644 --- a/tests/script/general/http/telegraf.sim +++ b/tests/script/general/http/telegraf.sim @@ -2,8 +2,8 @@ system sh/stop_dnodes.sh sleep 5000 -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1 system sh/cfg.sh -n dnode1 -c telegrafUseFieldNum -v 0 diff --git a/tests/script/general/import/basic.sim b/tests/script/general/import/basic.sim index 018d9ea7f7..5037014728 100644 --- a/tests/script/general/import/basic.sim +++ b/tests/script/general/import/basic.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 @@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0 system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c commitlog -v 0 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 - print ========= start dnode1 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/import/commit.sim b/tests/script/general/import/commit.sim index 974d9e394f..2197c1d39d 100644 --- a/tests/script/general/import/commit.sim +++ b/tests/script/general/import/commit.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 @@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0 system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c commitlog -v 0 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 - print ========= start dnode1 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/import/large.sim b/tests/script/general/import/large.sim index 9fa8f66299..77a47a1049 100644 --- a/tests/script/general/import/large.sim +++ b/tests/script/general/import/large.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 @@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0 system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c commitlog -v 0 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 - print ========= start dnode1 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/import/replica1.sim b/tests/script/general/import/replica1.sim index 62fb5e78d4..193082097c 100644 --- a/tests/script/general/import/replica1.sim +++ b/tests/script/general/import/replica1.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 @@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0 system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c commitlog -v 0 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 - print ========= start dnode1 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/insert/basic.sim b/tests/script/general/insert/basic.sim index 3b18c7e23a..9136f1e66f 100644 --- a/tests/script/general/insert/basic.sim +++ b/tests/script/general/insert/basic.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/insert_drop.sim b/tests/script/general/insert/insert_drop.sim index ef183bb2f0..89aad81229 100644 --- a/tests/script/general/insert/insert_drop.sim +++ b/tests/script/general/insert/insert_drop.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 1 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/query_block1_file.sim b/tests/script/general/insert/query_block1_file.sim index dff250ba8b..d13fb9841d 100644 --- a/tests/script/general/insert/query_block1_file.sim +++ b/tests/script/general/insert/query_block1_file.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/query_block1_memory.sim b/tests/script/general/insert/query_block1_memory.sim index b94eb4ecd1..c20613e192 100644 --- a/tests/script/general/insert/query_block1_memory.sim +++ b/tests/script/general/insert/query_block1_memory.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/query_block2_file.sim b/tests/script/general/insert/query_block2_file.sim index 3ce1e51e02..18a3f407bb 100644 --- a/tests/script/general/insert/query_block2_file.sim +++ b/tests/script/general/insert/query_block2_file.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/query_block2_memory.sim b/tests/script/general/insert/query_block2_memory.sim index 6546d89507..409e84269d 100644 --- a/tests/script/general/insert/query_block2_memory.sim +++ b/tests/script/general/insert/query_block2_memory.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/query_file_memory.sim b/tests/script/general/insert/query_file_memory.sim index d968f1b1f8..b6e1bf4e55 100644 --- a/tests/script/general/insert/query_file_memory.sim +++ b/tests/script/general/insert/query_file_memory.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/query_multi_file.sim b/tests/script/general/insert/query_multi_file.sim index 802efe2ac1..901b6409fc 100644 --- a/tests/script/general/insert/query_multi_file.sim +++ b/tests/script/general/insert/query_multi_file.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/tcp.sim b/tests/script/general/insert/tcp.sim index ecb6dc43d5..c2782ac1e1 100644 --- a/tests/script/general/insert/tcp.sim +++ b/tests/script/general/insert/tcp.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/metrics/disk.sim b/tests/script/general/metrics/disk.sim index a960fd96fa..421b5f7c6a 100644 --- a/tests/script/general/metrics/disk.sim +++ b/tests/script/general/metrics/disk.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 diff --git a/tests/script/general/metrics/metrics.sim b/tests/script/general/metrics/metrics.sim index 0aabadd0e4..f0864034de 100644 --- a/tests/script/general/metrics/metrics.sim +++ b/tests/script/general/metrics/metrics.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 diff --git a/tests/script/general/metrics/values.sim b/tests/script/general/metrics/values.sim index e91a9fee39..aa5aecd6ac 100644 --- a/tests/script/general/metrics/values.sim +++ b/tests/script/general/metrics/values.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 diff --git a/tests/script/general/metrics/vnode3.sim b/tests/script/general/metrics/vnode3.sim index 3a5c58363e..a2642ac7e8 100644 --- a/tests/script/general/metrics/vnode3.sim +++ b/tests/script/general/metrics/vnode3.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 diff --git a/tests/script/general/parser/alter.sim b/tests/script/general/parser/alter.sim index 87e4089d35..07b7f71fa4 100644 --- a/tests/script/general/parser/alter.sim +++ b/tests/script/general/parser/alter.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 3 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 3 diff --git a/tests/script/general/parser/alter1.sim b/tests/script/general/parser/alter1.sim index 695003c702..058977f784 100644 --- a/tests/script/general/parser/alter1.sim +++ b/tests/script/general/parser/alter1.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/alter_stable.sim b/tests/script/general/parser/alter_stable.sim index 6ef9b812e7..c0614ec00a 100644 --- a/tests/script/general/parser/alter_stable.sim +++ b/tests/script/general/parser/alter_stable.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 3 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 3 diff --git a/tests/script/general/parser/auto_create_tb.sim b/tests/script/general/parser/auto_create_tb.sim index ed3131d2ac..f9db56d15c 100644 --- a/tests/script/general/parser/auto_create_tb.sim +++ b/tests/script/general/parser/auto_create_tb.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/auto_create_tb_drop_tb.sim b/tests/script/general/parser/auto_create_tb_drop_tb.sim index 3489aba9fd..bb27c3e440 100644 --- a/tests/script/general/parser/auto_create_tb_drop_tb.sim +++ b/tests/script/general/parser/auto_create_tb_drop_tb.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 1 system sh/cfg.sh -n dnode1 -c commitTime -v 30 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/binary_escapeCharacter.sim b/tests/script/general/parser/binary_escapeCharacter.sim index 6ab86c5ba3..7342a96f4f 100644 --- a/tests/script/general/parser/binary_escapeCharacter.sim +++ b/tests/script/general/parser/binary_escapeCharacter.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 3 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 3 diff --git a/tests/script/general/parser/bug.sim b/tests/script/general/parser/bug.sim index cac74671f3..7e7d7e536e 100644 --- a/tests/script/general/parser/bug.sim +++ b/tests/script/general/parser/bug.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c dDebugFlag -v 135 diff --git a/tests/script/general/parser/col_arithmetic_operation.sim b/tests/script/general/parser/col_arithmetic_operation.sim index 5b478d7fc2..b4ffeadc23 100644 --- a/tests/script/general/parser/col_arithmetic_operation.sim +++ b/tests/script/general/parser/col_arithmetic_operation.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/columnValue.sim b/tests/script/general/parser/columnValue.sim index 854bb219e5..ead480cad8 100644 --- a/tests/script/general/parser/columnValue.sim +++ b/tests/script/general/parser/columnValue.sim @@ -1,7 +1,7 @@ #### system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 3 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 3 diff --git a/tests/script/general/parser/commit.sim b/tests/script/general/parser/commit.sim index 61faad1864..eab9497b0b 100644 --- a/tests/script/general/parser/commit.sim +++ b/tests/script/general/parser/commit.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/create_db.sim b/tests/script/general/parser/create_db.sim index 9bfeef7355..b272ef1ddb 100644 --- a/tests/script/general/parser/create_db.sim +++ b/tests/script/general/parser/create_db.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/create_mt.sim b/tests/script/general/parser/create_mt.sim index 486a1e3fc8..83dd09eb8f 100644 --- a/tests/script/general/parser/create_mt.sim +++ b/tests/script/general/parser/create_mt.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/create_tb.sim b/tests/script/general/parser/create_tb.sim index 489780130a..5e3007824a 100644 --- a/tests/script/general/parser/create_tb.sim +++ b/tests/script/general/parser/create_tb.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/dbtbnameValidate.sim b/tests/script/general/parser/dbtbnameValidate.sim index 0ec5f3c9aa..c4a789da79 100644 --- a/tests/script/general/parser/dbtbnameValidate.sim +++ b/tests/script/general/parser/dbtbnameValidate.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 1000 diff --git a/tests/script/general/parser/fill.sim b/tests/script/general/parser/fill.sim index 89e35e1a38..33286ecfcb 100644 --- a/tests/script/general/parser/fill.sim +++ b/tests/script/general/parser/fill.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/fill_stb.sim b/tests/script/general/parser/fill_stb.sim index 0740ab64fa..8fecaeb4c4 100644 --- a/tests/script/general/parser/fill_stb.sim +++ b/tests/script/general/parser/fill_stb.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/first_last.sim b/tests/script/general/parser/first_last.sim index dd125c60f9..b5133ed9a1 100644 --- a/tests/script/general/parser/first_last.sim +++ b/tests/script/general/parser/first_last.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/groupby.sim b/tests/script/general/parser/groupby.sim index ca83fb19b2..4d367999b2 100644 --- a/tests/script/general/parser/groupby.sim +++ b/tests/script/general/parser/groupby.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 1000 diff --git a/tests/script/general/parser/import.sim b/tests/script/general/parser/import.sim index d3b96cbf89..465f077fec 100644 --- a/tests/script/general/parser/import.sim +++ b/tests/script/general/parser/import.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/import_commit1.sim b/tests/script/general/parser/import_commit1.sim index a9935aa54e..a1bc057aef 100644 --- a/tests/script/general/parser/import_commit1.sim +++ b/tests/script/general/parser/import_commit1.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 1 system sh/cfg.sh -n dnode1 -c commitTime -v 30 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/import_commit2.sim b/tests/script/general/parser/import_commit2.sim index d5edb89f8e..c02905a2d5 100644 --- a/tests/script/general/parser/import_commit2.sim +++ b/tests/script/general/parser/import_commit2.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 1 system sh/cfg.sh -n dnode1 -c commitTime -v 30 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/import_commit3.sim b/tests/script/general/parser/import_commit3.sim index be915b5406..c37ecd9a17 100644 --- a/tests/script/general/parser/import_commit3.sim +++ b/tests/script/general/parser/import_commit3.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 1 system sh/cfg.sh -n dnode1 -c commitTime -v 30 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/import_file.sim b/tests/script/general/parser/import_file.sim index 2566e956b3..f0fef295c4 100644 --- a/tests/script/general/parser/import_file.sim +++ b/tests/script/general/parser/import_file.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 2000 diff --git a/tests/script/general/parser/insert_multiTbl.sim b/tests/script/general/parser/insert_multiTbl.sim index 4e4b8b3e13..503ab7e1da 100644 --- a/tests/script/general/parser/insert_multiTbl.sim +++ b/tests/script/general/parser/insert_multiTbl.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 2000 diff --git a/tests/script/general/parser/insert_tb.sim b/tests/script/general/parser/insert_tb.sim index f7e2980707..c69228d662 100644 --- a/tests/script/general/parser/insert_tb.sim +++ b/tests/script/general/parser/insert_tb.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/interp.sim b/tests/script/general/parser/interp.sim index 2d3bc2ac87..78369ec84c 100644 --- a/tests/script/general/parser/interp.sim +++ b/tests/script/general/parser/interp.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/join.sim b/tests/script/general/parser/join.sim index b9b35e0cd3..b90579d8d8 100644 --- a/tests/script/general/parser/join.sim +++ b/tests/script/general/parser/join.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c debugFlag -v 135 system sh/cfg.sh -n dnode1 -c rpcDebugFlag -v 135 diff --git a/tests/script/general/parser/join_multivnode.sim b/tests/script/general/parser/join_multivnode.sim index 46f38f9ce0..983b7fad45 100644 --- a/tests/script/general/parser/join_multivnode.sim +++ b/tests/script/general/parser/join_multivnode.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/parser/lastrow.sim b/tests/script/general/parser/lastrow.sim index c76c71b62e..50317c7abc 100644 --- a/tests/script/general/parser/lastrow.sim +++ b/tests/script/general/parser/lastrow.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/limit.sim b/tests/script/general/parser/limit.sim index 4ca348dbd6..16b2a2878c 100644 --- a/tests/script/general/parser/limit.sim +++ b/tests/script/general/parser/limit.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/limit1.sim b/tests/script/general/parser/limit1.sim index bdb5b90983..9856365f8e 100644 --- a/tests/script/general/parser/limit1.sim +++ b/tests/script/general/parser/limit1.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/limit1_tblocks100.sim b/tests/script/general/parser/limit1_tblocks100.sim index 6e108226a5..b89b7892d4 100644 --- a/tests/script/general/parser/limit1_tblocks100.sim +++ b/tests/script/general/parser/limit1_tblocks100.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/limit2.sim b/tests/script/general/parser/limit2.sim index 4374ac9be2..71f1c6f2e8 100644 --- a/tests/script/general/parser/limit2.sim +++ b/tests/script/general/parser/limit2.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c rowsInFileBlock -v 255 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/limit2_tblocks100.sim b/tests/script/general/parser/limit2_tblocks100.sim index 061d7225b1..a91103270d 100644 --- a/tests/script/general/parser/limit2_tblocks100.sim +++ b/tests/script/general/parser/limit2_tblocks100.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c rowsInFileBlock -v 255 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/mixed_blocks.sim b/tests/script/general/parser/mixed_blocks.sim index 03c3a77a89..29f6d2a742 100644 --- a/tests/script/general/parser/mixed_blocks.sim +++ b/tests/script/general/parser/mixed_blocks.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/nchar.sim b/tests/script/general/parser/nchar.sim index b6c3a3c9bb..51853825c1 100644 --- a/tests/script/general/parser/nchar.sim +++ b/tests/script/general/parser/nchar.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/null_char.sim b/tests/script/general/parser/null_char.sim index eeb94708d9..225c7b6cb7 100644 --- a/tests/script/general/parser/null_char.sim +++ b/tests/script/general/parser/null_char.sim @@ -1,7 +1,7 @@ #### TBASE-679 system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 3 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 3 diff --git a/tests/script/general/parser/projection_limit_offset.sim b/tests/script/general/parser/projection_limit_offset.sim index 2f18e3cf34..21c2151b77 100644 --- a/tests/script/general/parser/projection_limit_offset.sim +++ b/tests/script/general/parser/projection_limit_offset.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/selectResNum.sim b/tests/script/general/parser/selectResNum.sim index 3065c7eca0..dd06d26521 100644 --- a/tests/script/general/parser/selectResNum.sim +++ b/tests/script/general/parser/selectResNum.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/select_across_vnodes.sim b/tests/script/general/parser/select_across_vnodes.sim index 875036082d..67c727ef28 100644 --- a/tests/script/general/parser/select_across_vnodes.sim +++ b/tests/script/general/parser/select_across_vnodes.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 5 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 diff --git a/tests/script/general/parser/select_from_cache_disk.sim b/tests/script/general/parser/select_from_cache_disk.sim index a60571b7d1..9450d41720 100644 --- a/tests/script/general/parser/select_from_cache_disk.sim +++ b/tests/script/general/parser/select_from_cache_disk.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 diff --git a/tests/script/general/parser/select_with_tags.sim b/tests/script/general/parser/select_with_tags.sim index 8558323eba..92e30bc914 100644 --- a/tests/script/general/parser/select_with_tags.sim +++ b/tests/script/general/parser/select_with_tags.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 1000 diff --git a/tests/script/general/parser/set_tag_vals.sim b/tests/script/general/parser/set_tag_vals.sim index 8076643247..62fef45846 100644 --- a/tests/script/general/parser/set_tag_vals.sim +++ b/tests/script/general/parser/set_tag_vals.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/single_row_in_tb.sim b/tests/script/general/parser/single_row_in_tb.sim index bf94c71347..1a159d97fd 100644 --- a/tests/script/general/parser/single_row_in_tb.sim +++ b/tests/script/general/parser/single_row_in_tb.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/slimit.sim b/tests/script/general/parser/slimit.sim index ae83d92e22..61abf1eb2a 100644 --- a/tests/script/general/parser/slimit.sim +++ b/tests/script/general/parser/slimit.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 diff --git a/tests/script/general/parser/slimit1.sim b/tests/script/general/parser/slimit1.sim index 40be5c1b91..d034d5bf17 100644 --- a/tests/script/general/parser/slimit1.sim +++ b/tests/script/general/parser/slimit1.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10 diff --git a/tests/script/general/parser/slimit_alter_tags.sim b/tests/script/general/parser/slimit_alter_tags.sim index 6091fa89b4..6579549287 100644 --- a/tests/script/general/parser/slimit_alter_tags.sim +++ b/tests/script/general/parser/slimit_alter_tags.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10 diff --git a/tests/script/general/parser/stream.sim b/tests/script/general/parser/stream.sim index 33a7d2ac6e..b3334d970e 100644 --- a/tests/script/general/parser/stream.sim +++ b/tests/script/general/parser/stream.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 5 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 5 diff --git a/tests/script/general/parser/stream_on_sys.sim b/tests/script/general/parser/stream_on_sys.sim index d0f6cbace3..aa3595eaf6 100644 --- a/tests/script/general/parser/stream_on_sys.sim +++ b/tests/script/general/parser/stream_on_sys.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c monitor -v 1 system sh/cfg.sh -n dnode1 -c monitorInterval -v 1 diff --git a/tests/script/general/parser/tags_dynamically_specifiy.sim b/tests/script/general/parser/tags_dynamically_specifiy.sim index b34ea90413..ca8d335742 100644 --- a/tests/script/general/parser/tags_dynamically_specifiy.sim +++ b/tests/script/general/parser/tags_dynamically_specifiy.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/tags_filter.sim b/tests/script/general/parser/tags_filter.sim index 29b295b6cd..bc6c6c52f0 100644 --- a/tests/script/general/parser/tags_filter.sim +++ b/tests/script/general/parser/tags_filter.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/tbnameIn.sim b/tests/script/general/parser/tbnameIn.sim index d3b16ea202..38551dd59e 100644 --- a/tests/script/general/parser/tbnameIn.sim +++ b/tests/script/general/parser/tbnameIn.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/timestamp.sim b/tests/script/general/parser/timestamp.sim index edc03fc4f0..8d407dd5cc 100644 --- a/tests/script/general/parser/timestamp.sim +++ b/tests/script/general/parser/timestamp.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/where.sim b/tests/script/general/parser/where.sim index 397ce53477..05237c392b 100644 --- a/tests/script/general/parser/where.sim +++ b/tests/script/general/parser/where.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/show/dnodes.sim b/tests/script/general/show/dnodes.sim index df78194365..0951c1a6c9 100644 --- a/tests/script/general/show/dnodes.sim +++ b/tests/script/general/show/dnodes.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/stream/metrics_1.sim b/tests/script/general/stream/metrics_1.sim index e61572d9f4..2e8d02bf21 100644 --- a/tests/script/general/stream/metrics_1.sim +++ b/tests/script/general/stream/metrics_1.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/stream/metrics_del.sim b/tests/script/general/stream/metrics_del.sim index 9077d48f45..7ca74dc102 100644 --- a/tests/script/general/stream/metrics_del.sim +++ b/tests/script/general/stream/metrics_del.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfBlocksPerMeter -v 4 system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100 diff --git a/tests/script/general/stream/metrics_n.sim b/tests/script/general/stream/metrics_n.sim index c3b20f8616..31f9fc64ff 100644 --- a/tests/script/general/stream/metrics_n.sim +++ b/tests/script/general/stream/metrics_n.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/stream/metrics_replica1_vnoden.sim b/tests/script/general/stream/metrics_replica1_vnoden.sim index 5129dc2f02..76ffd99d89 100644 --- a/tests/script/general/stream/metrics_replica1_vnoden.sim +++ b/tests/script/general/stream/metrics_replica1_vnoden.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 diff --git a/tests/script/general/stream/stream_1.sim b/tests/script/general/stream/stream_1.sim index 0178ef2ac3..bb2d4a05a5 100644 --- a/tests/script/general/stream/stream_1.sim +++ b/tests/script/general/stream/stream_1.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/stream/stream_2.sim b/tests/script/general/stream/stream_2.sim index a2af8f8548..d0fa60ff90 100644 --- a/tests/script/general/stream/stream_2.sim +++ b/tests/script/general/stream/stream_2.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/stream/stream_3.sim b/tests/script/general/stream/stream_3.sim index 6758d74aba..3e7d574cd4 100644 --- a/tests/script/general/stream/stream_3.sim +++ b/tests/script/general/stream/stream_3.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start @@ -107,7 +107,7 @@ endi print =============== step7 system sh/exec.sh -n dnode1 -s stop -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfBlocksPerMeter -v 4 system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100 diff --git a/tests/script/general/stream/stream_restart.sim b/tests/script/general/stream/stream_restart.sim index 6d9324b69c..f37fbf471d 100644 --- a/tests/script/general/stream/stream_restart.sim +++ b/tests/script/general/stream/stream_restart.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/stream/table_1.sim b/tests/script/general/stream/table_1.sim index 08aa4912e3..be45a98f49 100644 --- a/tests/script/general/stream/table_1.sim +++ b/tests/script/general/stream/table_1.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/stream/table_del.sim b/tests/script/general/stream/table_del.sim index 509c72e4c8..a2db5b250d 100644 --- a/tests/script/general/stream/table_del.sim +++ b/tests/script/general/stream/table_del.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfBlocksPerMeter -v 4 system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100 diff --git a/tests/script/general/stream/table_n.sim b/tests/script/general/stream/table_n.sim index 3eeadd0aff..49e8e723da 100644 --- a/tests/script/general/stream/table_n.sim +++ b/tests/script/general/stream/table_n.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/stream/table_replica1_vnoden.sim b/tests/script/general/stream/table_replica1_vnoden.sim index f9db9fd9f4..1ed649a3fb 100644 --- a/tests/script/general/stream/table_replica1_vnoden.sim +++ b/tests/script/general/stream/table_replica1_vnoden.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 diff --git a/tests/script/general/table/autocreate.sim b/tests/script/general/table/autocreate.sim new file mode 100644 index 0000000000..eac153e3c2 --- /dev/null +++ b/tests/script/general/table/autocreate.sim @@ -0,0 +1,102 @@ +system sh/stop_dnodes.sh +system sh/deploy.sh -n dnode1 -i 1 +system sh/exec.sh -n dnode1 -s start +sql connect + +print =============== create database +sql create database db +sql show databases +if $rows != 1 then + return -1 +endi + +print $data00 $data01 $data02 + +print =============== create super table +sql create table db.st1 (ts timestamp, i int) tags (j int) +sql create table db.st2 (ts timestamp, i int, j int) tags (t1 int, t2 int, t3 int) +sql show db.stables +if $rows != 2 then + return -1 +endi + +print $data00 $data01 $data02 + +print =============== create child table +sql insert into db.c1 using db.st1 tags(1) values(now, 1); +sql insert into db.c2 using db.st1 tags(2) values(now, 2); +sql insert into db.c3 using db.st1 tags(3) values(now, 3); +sql insert into db.c4 using db.st1 tags(4) values(now, 4); +sql insert into db.c1 using db.st1 tags(1) values(now, 1); +sql insert into db.c2 using db.st1 tags(2) values(now, 2); +sql insert into db.c3 using db.st1 tags(3) values(now, 3); +sql insert into db.c4 using db.st1 tags(4) values(now, 4); + +sql show db.tables +if $rows != 4 then + return -1 +endi + +sql select * from db.c1 +if $rows != 2 then + return -1 +endi + +sql select * from db.c2 +if $rows != 2 then + return -1 +endi + +sql select * from db.c3 +if $rows != 2 then + return -1 +endi + +sql select * from db.c4 +if $rows != 2 then + return -1 +endi + +sql select * from db.st1 +if $rows != 8 then + return -1 +endi + +print =============== insert data +sql insert into db.s1 using db.st2 tags(1, 1, 1) values(now, 1, 2); +sql insert into db.s2 using db.st2 tags(2, 2, 2) values(now, 2, 3); +sql insert into db.s3 using db.st2 tags(3, 3, 3) values(now, 3, 4); +sql insert into db.s4 using db.st2 tags(4, 4, 4) values(now, 4, 5); +sql insert into db.s1 using db.st2 tags(1, 1, 1) values(now, 1, 2); +sql insert into db.s2 using db.st2 tags(2, 2, 2) values(now, 2, 3); +sql insert into db.s3 using db.st2 tags(3, 3, 3) values(now, 3, 4); +sql insert into db.s4 using db.st2 tags(4, 4, 4) values(now, 4, 5); +sql insert into db.s1 using db.st2 tags(1, 1, 1) values(now, 1, 2); +sql insert into db.s2 using db.st2 tags(2, 2, 2) values(now, 2, 3); +sql insert into db.s3 using db.st2 tags(3, 3, 3) values(now, 3, 4); +sql insert into db.s4 using db.st2 tags(4, 4, 4) values(now, 4, 5); + +sql show db.tables +if $rows != 8 then + return -1 +endi + +sql select * from db.s1 +if $rows != 3 then + return -1 +endi + +sql select * from db.s2 +if $rows != 3 then + return -1 +endi + +sql select * from db.s3 +if $rows != 3 then + return -1 +endi + +sql select * from db.s4 +if $rows != 3 then + return -1 +endi diff --git a/tests/script/general/table/basic1.sim b/tests/script/general/table/basic1.sim index a8dfb0f21a..0e425c95f9 100644 --- a/tests/script/general/table/basic1.sim +++ b/tests/script/general/table/basic1.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/table/basic2.sim b/tests/script/general/table/basic2.sim index 1f6d889429..40688403a8 100644 --- a/tests/script/general/table/basic2.sim +++ b/tests/script/general/table/basic2.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/table/basic3.sim b/tests/script/general/table/basic3.sim index 6558617384..18c3f9b625 100644 --- a/tests/script/general/table/basic3.sim +++ b/tests/script/general/table/basic3.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/table/bigint.sim b/tests/script/general/table/bigint.sim index 667ce523cb..4145968fbd 100644 --- a/tests/script/general/table/bigint.sim +++ b/tests/script/general/table/bigint.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/binary.sim b/tests/script/general/table/binary.sim index bc91c48c19..b0c5166d20 100644 --- a/tests/script/general/table/binary.sim +++ b/tests/script/general/table/binary.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/bool.sim b/tests/script/general/table/bool.sim index 1393315b4f..b55147b67e 100644 --- a/tests/script/general/table/bool.sim +++ b/tests/script/general/table/bool.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/column2.sim b/tests/script/general/table/column2.sim index 3d32ae454e..4c27ae68ad 100644 --- a/tests/script/general/table/column2.sim +++ b/tests/script/general/table/column2.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/column_name.sim b/tests/script/general/table/column_name.sim index c49e58336d..41a4179a41 100644 --- a/tests/script/general/table/column_name.sim +++ b/tests/script/general/table/column_name.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/column_num.sim b/tests/script/general/table/column_num.sim index 5e124a1943..bf82b9fc05 100644 --- a/tests/script/general/table/column_num.sim +++ b/tests/script/general/table/column_num.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/column_value.sim b/tests/script/general/table/column_value.sim index bb811b7ab8..2a1636e5ca 100644 --- a/tests/script/general/table/column_value.sim +++ b/tests/script/general/table/column_value.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/date.sim b/tests/script/general/table/date.sim index 52242b6388..f702a55750 100644 --- a/tests/script/general/table/date.sim +++ b/tests/script/general/table/date.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/db.table.sim b/tests/script/general/table/db.table.sim index 242f778a15..653a73310f 100644 --- a/tests/script/general/table/db.table.sim +++ b/tests/script/general/table/db.table.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/delete_reuse1.sim b/tests/script/general/table/delete_reuse1.sim index 1f47088c6f..1f42637088 100644 --- a/tests/script/general/table/delete_reuse1.sim +++ b/tests/script/general/table/delete_reuse1.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/table/delete_reuse2.sim b/tests/script/general/table/delete_reuse2.sim index acd69bc488..238eac975d 100644 --- a/tests/script/general/table/delete_reuse2.sim +++ b/tests/script/general/table/delete_reuse2.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/table/delete_writing.sim b/tests/script/general/table/delete_writing.sim index 769207b83c..b697c7f841 100644 --- a/tests/script/general/table/delete_writing.sim +++ b/tests/script/general/table/delete_writing.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/table/describe.sim b/tests/script/general/table/describe.sim index 1905a0b032..fd9a8eda18 100644 --- a/tests/script/general/table/describe.sim +++ b/tests/script/general/table/describe.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/double.sim b/tests/script/general/table/double.sim index 2b34f5a191..36013be51d 100644 --- a/tests/script/general/table/double.sim +++ b/tests/script/general/table/double.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/float.sim b/tests/script/general/table/float.sim index 95666f677b..195a2268b7 100644 --- a/tests/script/general/table/float.sim +++ b/tests/script/general/table/float.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/int.sim b/tests/script/general/table/int.sim index 70a2ac767d..0f8223896c 100644 --- a/tests/script/general/table/int.sim +++ b/tests/script/general/table/int.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/limit.sim b/tests/script/general/table/limit.sim index 904a49a2fd..e01a209b61 100644 --- a/tests/script/general/table/limit.sim +++ b/tests/script/general/table/limit.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 129 diff --git a/tests/script/general/table/smallint.sim b/tests/script/general/table/smallint.sim index 0547fbb1b6..6a0fbd7fb5 100644 --- a/tests/script/general/table/smallint.sim +++ b/tests/script/general/table/smallint.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/table.sim b/tests/script/general/table/table.sim index 2c8467b9a3..468e60f1ba 100644 --- a/tests/script/general/table/table.sim +++ b/tests/script/general/table/table.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/table_len.sim b/tests/script/general/table/table_len.sim index 37c06c515c..e1ed254fe1 100644 --- a/tests/script/general/table/table_len.sim +++ b/tests/script/general/table/table_len.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/testSuite.sim b/tests/script/general/table/testSuite.sim index 8a8698a60d..5e4388619b 100644 --- a/tests/script/general/table/testSuite.sim +++ b/tests/script/general/table/testSuite.sim @@ -1,25 +1,26 @@ +run general/table/autocreate.sim run general/table/basic1.sim run general/table/basic2.sim run general/table/basic3.sim -#run general/table/table.sim -#run general/table/vgroup.sim -#run general/table/limit.sim -#run general/table/table_len.sim -run general/table/column_num.sim -#run general/table/column2.sim -run general/table/column_name.sim -#run general/table/column_value.sim -#run general/table/describe.sim -#run general/table/date.sim run general/table/bigint.sim #run general/table/binary.sim run general/table/bool.sim -run general/table/double.sim -run general/table/float.sim -run general/table/int.sim -run general/table/smallint.sim -run general/table/tinyint.sim +run general/table/column_name.sim +run general/table/column_num.sim +#run general/table/column_value.sim +#run general/table/column2.sim +#run general/table/date.sim run general/table/db.table.sim #run general/table/delete_reuse1.sim #run general/table/delete_reuse2.sim #run general/table/delete_writing.sim +#run general/table/describe.sim +run general/table/double.sim +run general/table/float.sim +run general/table/int.sim +#run general/table/limit.sim +run general/table/smallint.sim +#run general/table/table_len.sim +#run general/table/table.sim +run general/table/tinyint.sim +#run general/table/vgroup.sim diff --git a/tests/script/general/table/tinyint.sim b/tests/script/general/table/tinyint.sim index 4e50b6dba2..d22331c2a3 100644 --- a/tests/script/general/table/tinyint.sim +++ b/tests/script/general/table/tinyint.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/vgroup.sim b/tests/script/general/table/vgroup.sim index d5198534bc..cd5c44fb60 100644 --- a/tests/script/general/table/vgroup.sim +++ b/tests/script/general/table/vgroup.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/3.sim b/tests/script/general/tag/3.sim index b972bdf975..1cc2fa8cf7 100644 --- a/tests/script/general/tag/3.sim +++ b/tests/script/general/tag/3.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/4.sim b/tests/script/general/tag/4.sim index d75f5478c1..02bb910888 100644 --- a/tests/script/general/tag/4.sim +++ b/tests/script/general/tag/4.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/5.sim b/tests/script/general/tag/5.sim index bf8cb9358a..3231f738a7 100644 --- a/tests/script/general/tag/5.sim +++ b/tests/script/general/tag/5.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/6.sim b/tests/script/general/tag/6.sim index 3705ffc110..9c106a189c 100644 --- a/tests/script/general/tag/6.sim +++ b/tests/script/general/tag/6.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/add.sim b/tests/script/general/tag/add.sim index b36bc0c6c3..6c9456d57a 100644 --- a/tests/script/general/tag/add.sim +++ b/tests/script/general/tag/add.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/bigint.sim b/tests/script/general/tag/bigint.sim index 5519f6759e..3522d91b93 100644 --- a/tests/script/general/tag/bigint.sim +++ b/tests/script/general/tag/bigint.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/binary.sim b/tests/script/general/tag/binary.sim index f5e779bfee..45aedf6db8 100644 --- a/tests/script/general/tag/binary.sim +++ b/tests/script/general/tag/binary.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/binary_binary.sim b/tests/script/general/tag/binary_binary.sim index f2622bd034..fdb10d5877 100644 --- a/tests/script/general/tag/binary_binary.sim +++ b/tests/script/general/tag/binary_binary.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/bool.sim b/tests/script/general/tag/bool.sim index fb69a0ac67..da3da99b19 100644 --- a/tests/script/general/tag/bool.sim +++ b/tests/script/general/tag/bool.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/bool_binary.sim b/tests/script/general/tag/bool_binary.sim index 55542d7de7..ddd5b3df94 100644 --- a/tests/script/general/tag/bool_binary.sim +++ b/tests/script/general/tag/bool_binary.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/bool_int.sim b/tests/script/general/tag/bool_int.sim index 261bbfb3d8..6f1a637965 100644 --- a/tests/script/general/tag/bool_int.sim +++ b/tests/script/general/tag/bool_int.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/change.sim b/tests/script/general/tag/change.sim index b77e5765d2..f0f4efb9c6 100644 --- a/tests/script/general/tag/change.sim +++ b/tests/script/general/tag/change.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/column.sim b/tests/script/general/tag/column.sim index a7f1b1c8c2..4313f48e5f 100644 --- a/tests/script/general/tag/column.sim +++ b/tests/script/general/tag/column.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/commit.sim b/tests/script/general/tag/commit.sim index 84bb72271b..94ea85781a 100644 --- a/tests/script/general/tag/commit.sim +++ b/tests/script/general/tag/commit.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/create.sim b/tests/script/general/tag/create.sim index 9742b1c8da..852eadfbcc 100644 --- a/tests/script/general/tag/create.sim +++ b/tests/script/general/tag/create.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/delete.sim b/tests/script/general/tag/delete.sim index 2a0e3ea58c..ae424ef58c 100644 --- a/tests/script/general/tag/delete.sim +++ b/tests/script/general/tag/delete.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/double.sim b/tests/script/general/tag/double.sim index 8c5831b74c..d811325b10 100644 --- a/tests/script/general/tag/double.sim +++ b/tests/script/general/tag/double.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/filter.sim b/tests/script/general/tag/filter.sim index 6d8f9ff893..b10e8a0372 100644 --- a/tests/script/general/tag/filter.sim +++ b/tests/script/general/tag/filter.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/tag/float.sim b/tests/script/general/tag/float.sim index 49fcf8029b..537211fe1b 100644 --- a/tests/script/general/tag/float.sim +++ b/tests/script/general/tag/float.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/int.sim b/tests/script/general/tag/int.sim index d663dd6eb0..ea635d9db6 100644 --- a/tests/script/general/tag/int.sim +++ b/tests/script/general/tag/int.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/int_binary.sim b/tests/script/general/tag/int_binary.sim index 29220eb92f..166285f799 100644 --- a/tests/script/general/tag/int_binary.sim +++ b/tests/script/general/tag/int_binary.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/int_float.sim b/tests/script/general/tag/int_float.sim index 4cb85b7e3d..4745ae704f 100644 --- a/tests/script/general/tag/int_float.sim +++ b/tests/script/general/tag/int_float.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/set.sim b/tests/script/general/tag/set.sim index 0c6ddd17d0..fd9fdd2807 100644 --- a/tests/script/general/tag/set.sim +++ b/tests/script/general/tag/set.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/smallint.sim b/tests/script/general/tag/smallint.sim index f38f6e2340..701e605e38 100644 --- a/tests/script/general/tag/smallint.sim +++ b/tests/script/general/tag/smallint.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/tinyint.sim b/tests/script/general/tag/tinyint.sim index f88cf0f61d..b65be72036 100644 --- a/tests/script/general/tag/tinyint.sim +++ b/tests/script/general/tag/tinyint.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/user/basic1.sim b/tests/script/general/user/basic1.sim index 4bc7deae83..1cff77d317 100644 --- a/tests/script/general/user/basic1.sim +++ b/tests/script/general/user/basic1.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/user/monitor.sim b/tests/script/general/user/monitor.sim index d53ade2e4b..987cb84357 100644 --- a/tests/script/general/user/monitor.sim +++ b/tests/script/general/user/monitor.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 print ========== step1 system sh/cfg.sh -n dnode1 -c clog -v 0 diff --git a/tests/script/general/user/pass_alter.sim b/tests/script/general/user/pass_alter.sim index d815ca824f..f7eee1359b 100644 --- a/tests/script/general/user/pass_alter.sim +++ b/tests/script/general/user/pass_alter.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/user/pass_len.sim b/tests/script/general/user/pass_len.sim index 5520ce6f17..583c2e73d3 100644 --- a/tests/script/general/user/pass_len.sim +++ b/tests/script/general/user/pass_len.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/user/user_create.sim b/tests/script/general/user/user_create.sim index e63246cbd6..8f0d32e7cc 100644 --- a/tests/script/general/user/user_create.sim +++ b/tests/script/general/user/user_create.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/user/user_len.sim b/tests/script/general/user/user_len.sim index 71198c61cb..4d2658cec9 100644 --- a/tests/script/general/user/user_len.sim +++ b/tests/script/general/user/user_len.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/metrics_field.sim b/tests/script/general/vector/metrics_field.sim index 187ad51ca2..a883c81e18 100644 --- a/tests/script/general/vector/metrics_field.sim +++ b/tests/script/general/vector/metrics_field.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/metrics_mix.sim b/tests/script/general/vector/metrics_mix.sim index 3baf3732f1..26ff0af063 100644 --- a/tests/script/general/vector/metrics_mix.sim +++ b/tests/script/general/vector/metrics_mix.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/metrics_query.sim b/tests/script/general/vector/metrics_query.sim index 3690c9f29c..d797fa6467 100644 --- a/tests/script/general/vector/metrics_query.sim +++ b/tests/script/general/vector/metrics_query.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/metrics_tag.sim b/tests/script/general/vector/metrics_tag.sim index f4a4eea53f..29923d3d42 100644 --- a/tests/script/general/vector/metrics_tag.sim +++ b/tests/script/general/vector/metrics_tag.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/metrics_time.sim b/tests/script/general/vector/metrics_time.sim index b2fa6e98b0..9400b2a76a 100644 --- a/tests/script/general/vector/metrics_time.sim +++ b/tests/script/general/vector/metrics_time.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/multi.sim b/tests/script/general/vector/multi.sim index c9c7a95c71..dfdc015edf 100644 --- a/tests/script/general/vector/multi.sim +++ b/tests/script/general/vector/multi.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/single.sim b/tests/script/general/vector/single.sim index e87de13745..cd892bfd87 100644 --- a/tests/script/general/vector/single.sim +++ b/tests/script/general/vector/single.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/table_field.sim b/tests/script/general/vector/table_field.sim index 0308ff78c3..2894b04c6d 100644 --- a/tests/script/general/vector/table_field.sim +++ b/tests/script/general/vector/table_field.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/table_mix.sim b/tests/script/general/vector/table_mix.sim index 0c88406022..9cd4085912 100644 --- a/tests/script/general/vector/table_mix.sim +++ b/tests/script/general/vector/table_mix.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/table_query.sim b/tests/script/general/vector/table_query.sim index 5a94f30585..1e1784e726 100644 --- a/tests/script/general/vector/table_query.sim +++ b/tests/script/general/vector/table_query.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/table_time.sim b/tests/script/general/vector/table_time.sim index 6a661ba969..f0b0d525e6 100644 --- a/tests/script/general/vector/table_time.sim +++ b/tests/script/general/vector/table_time.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/sh/deploy.sh b/tests/script/sh/deploy.sh index 63c65d0345..81e955ccfb 100755 --- a/tests/script/sh/deploy.sh +++ b/tests/script/sh/deploy.sh @@ -2,28 +2,23 @@ echo "Executing deploy.sh" -if [ $# != 6 ]; then +if [ $# != 4 ]; then echo "argument list need input : " echo " -n nodeName" - echo " -i nodeIp" - echo " -m masterIp" + echo " -i nodePort" exit 1 fi NODE_NAME= -NODE_IP= -MSATER_IP= -while getopts "n:i:m:" arg +NODE= +while getopts "n:i:" arg do case $arg in n) NODE_NAME=$OPTARG ;; i) - NODE_IP=$OPTARG - ;; - m) - MASTER_IP=$OPTARG + NODE=$OPTARG ;; ?) echo "unkonw argument" @@ -48,14 +43,6 @@ CFG_DIR=$NODE_DIR/cfg LOG_DIR=$NODE_DIR/log DATA_DIR=$NODE_DIR/data -#echo ============ deploy $NODE_NAME -#echo === masterIp : $MASTER_IP -#echo === nodeIp : $NODE_IP -#echo === nodePath : $EXE_DIR -#echo === cfgPath : $CFG_DIR -#echo === logPath : $LOG_DIR -#echo === dataPath : $DATA_DIR - rm -rf $NODE_DIR mkdir -p $SIM_DIR @@ -83,13 +70,32 @@ if [ -f "$TAOS_FLAG" ] ; then sudo rm -rf $LOG_DIR fi -echo " " >> $TAOS_CFG -echo "masterIp $MASTER_IP" >> $TAOS_CFG +HOSTNAME=`hostname -f` + +if [ $NODE -eq 1 ]; then + NODE=7100 +elif [ $NODE -eq 2 ]; then + NODE=7200 +elif [ $NODE -eq 3 ]; then + NODE=7300 +elif [ $NODE -eq 4 ]; then + NODE=7400 +elif [ $NODE -eq 5 ]; then + NODE=7500 +elif [ $NODE -eq 6 ]; then + NODE=7600 +elif [ $NODE -eq 7 ]; then + NODE=7700 +elif [ $NODE -eq 8 ]; then + NODE=7800 +fi + +echo " " >> $TAOS_CFG +echo "first ${HOSTNAME}:7100" >> $TAOS_CFG +echo "second ${HOSTNAME}:7200" >> $TAOS_CFG +echo "serverPort ${NODE}" >> $TAOS_CFG echo "dataDir $DATA_DIR" >> $TAOS_CFG echo "logDir $LOG_DIR" >> $TAOS_CFG -echo "publicIp $NODE_IP" >> $TAOS_CFG -echo "internalIp $NODE_IP" >> $TAOS_CFG -echo "privateIp $NODE_IP" >> $TAOS_CFG echo "dDebugFlag 199" >> $TAOS_CFG echo "mDebugFlag 199" >> $TAOS_CFG echo "sdbDebugFlag 199" >> $TAOS_CFG diff --git a/tests/script/sh/exec_up.sh b/tests/script/sh/exec_up.sh index ee4aabc175..abe2822450 100755 --- a/tests/script/sh/exec_up.sh +++ b/tests/script/sh/exec_up.sh @@ -70,24 +70,15 @@ if [ "$CLEAR_OPTION" = "clear" ]; then rm -rf $MGMT_DIR fi -if [ "$SHELL_OPTION" = "true" ]; then - if [ "$EXEC_OPTON" = "start" ]; then - echo "ExcuteCmd:" $EXE_DIR/taos -c $CFG_DIR -u $USERS -p - $EXE_DIR/taos -c $CFG_DIR -u $USERS -p - else - #relative path - RCFG_DIR=sim/$NODE_NAME/cfg - PID=`ps -ef|grep -v taosd | grep taos | grep $RCFG_DIR | grep -v grep | awk '{print $2}'` - if [ -n "$PID" ]; then - sudo kill -9 $PID - fi - fi - return -fi - if [ "$EXEC_OPTON" = "start" ]; then echo "ExcuteCmd:" $EXE_DIR/taosd -c $CFG_DIR - nohup $EXE_DIR/taosd -c $CFG_DIR > /dev/null 2>&1 & + + if [ "$SHELL_OPTION" = "true" ]; then + nohup valgrind --log-file=${LOG_DIR}/valgrind.log --tool=memcheck --leak-check=full --show-reachable=no --track-origins=yes --show-leak-kinds=all -v --workaround-gcc296-bugs=yes $EXE_DIR/taosd -c $CFG_DIR > /dev/null 2>&1 & + else + nohup $EXE_DIR/taosd -c $CFG_DIR > /dev/null 2>&1 & + fi + #TT=`date +%s` #mkdir ${LOG_DIR}/${TT} #echo valgrind --log-file=${LOG_DIR}/${TT}/valgrind.log --tool=memcheck --leak-check=full --show-reachable=no --track-origins=yes --show-leak-kinds=all -v --workaround-gcc296-bugs=yes $EXE_DIR/taosd -c $CFG_DIR diff --git a/tests/script/test.sh b/tests/script/test.sh index b9660458b0..743597eabd 100755 --- a/tests/script/test.sh +++ b/tests/script/test.sh @@ -7,12 +7,14 @@ ################################################## set +e +#set -x FILE_NAME= RELEASE=0 ASYNC=0 VALGRIND=0 -while getopts "f:av" arg +UNIQUE=0 +while getopts "f:avu" arg do case $arg in f) @@ -24,6 +26,9 @@ do v) VALGRIND=1 ;; + u) + UNIQUE=1 + ;; ?) echo "unknow argument" ;; @@ -31,11 +36,6 @@ do done cd . -sh/ip.sh -i 1 -s up > /dev/null 2>&1 & -sh/ip.sh -i 2 -s up > /dev/null 2>&1 & -sh/ip.sh -i 3 -s up > /dev/null 2>&1 & -sh/ip.sh -i 4 -s up > /dev/null 2>&1 & -sh/ip.sh -i 5 -s up > /dev/null 2>&1 & # Get responsible directories CODE_DIR=`dirname $0` @@ -51,6 +51,12 @@ else PROGRAM="$BUILD_DIR/bin/tsim -a" fi +if [ $UNIQUE -eq 0 ]; then + PROGRAM=$BUILD_DIR/bin/tsim +else + PROGRAM="$TOP_DIR/../debug/build/bin/tsim" +fi + PRG_DIR=$SIM_DIR/tsim CFG_DIR=$PRG_DIR/cfg LOG_DIR=$PRG_DIR/log @@ -74,13 +80,15 @@ TAOS_CFG=$PRG_DIR/cfg/taos.cfg touch -f $TAOS_CFG TAOS_FLAG=$PRG_DIR/flag -echo " " >> $TAOS_CFG -echo "scriptDir ${CODE_DIR}/../script">> $TAOS_CFG -echo "masterIp 192.168.0.1" >> $TAOS_CFG -echo "secondIp 192.168.0.2" >> $TAOS_CFG -echo "localIp 127.0.0.1" >> $TAOS_CFG +HOSTNAME=`hostname -f` + +echo " " >> $TAOS_CFG +echo "first ${HOSTNAME}:7100" >> $TAOS_CFG +echo "second ${HOSTNAME}:7200" >> $TAOS_CFG +echo "serverPort 7100" >> $TAOS_CFG echo "dataDir $DATA_DIR" >> $TAOS_CFG echo "logDir $LOG_DIR" >> $TAOS_CFG +echo "scriptDir ${CODE_DIR}/../script">> $TAOS_CFG echo "numOfLogLines 100000000" >> $TAOS_CFG echo "dDebugFlag 135" >> $TAOS_CFG echo "mDebugFlag 135" >> $TAOS_CFG @@ -89,12 +97,12 @@ echo "rpcDebugFlag 135" >> $TAOS_CFG echo "tmrDebugFlag 131" >> $TAOS_CFG echo "cDebugFlag 135" >> $TAOS_CFG echo "httpDebugFlag 135" >> $TAOS_CFG -echo "monitorDebugFlag 135" >> $TAOS_CFG +echo "monitorDebugFlag 135" >> $TAOS_CFG echo "udebugFlag 135" >> $TAOS_CFG echo "clog 0" >> $TAOS_CFG echo "asyncLog 0" >> $TAOS_CFG echo "locale en_US.UTF-8" >> $TAOS_CFG -echo " " >> $TAOS_CFG +echo " " >> $TAOS_CFG ulimit -n 600000 ulimit -c unlimited diff --git a/tests/script/tmp/dnode1.sim b/tests/script/tmp/dnode1.sim index 7b6e3723cb..67d0dd4c12 100644 --- a/tests/script/tmp/dnode1.sim +++ b/tests/script/tmp/dnode1.sim @@ -1,4 +1,4 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect \ No newline at end of file diff --git a/tests/script/tmp/mnodes.sim b/tests/script/tmp/mnodes.sim index 32e72f16ff..38d99bd214 100644 --- a/tests/script/tmp/mnodes.sim +++ b/tests/script/tmp/mnodes.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3 diff --git a/tests/script/tmp/prepare.sim b/tests/script/tmp/prepare.sim index 7890864360..eda0452459 100644 --- a/tests/script/tmp/prepare.sim +++ b/tests/script/tmp/prepare.sim @@ -1,13 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 2 system sh/cfg.sh -n dnode2 -c commitLog -v 2 diff --git a/tests/script/unique/account/account_create.sim b/tests/script/unique/account/account_create.sim index ca7e91e892..b6eb239052 100644 --- a/tests/script/unique/account/account_create.sim +++ b/tests/script/unique/account/account_create.sim @@ -1,7 +1,5 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec_up.sh -n dnode1 -s start diff --git a/tests/script/unique/account/account_delete.sim b/tests/script/unique/account/account_delete.sim index f4bc8d0a2f..6d1c148698 100644 --- a/tests/script/unique/account/account_delete.sim +++ b/tests/script/unique/account/account_delete.sim @@ -1,7 +1,5 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec_up.sh -n dnode1 -s start @@ -53,7 +51,8 @@ if $rows != 0 then return -1 endi sql show dnodes -if $data03 != 2 then +print $data00 $data01 $data02 $data03 +if $data02 != 2 then return -1 endi sql drop account oroot @@ -68,7 +67,7 @@ show4: endi sql show dnodes -if $data03 != 0 then +if $data02 != 0 then goto show4 endi diff --git a/tests/script/unique/account/account_len.sim b/tests/script/unique/account/account_len.sim index 80d1a56a09..06fb37bb5a 100644 --- a/tests/script/unique/account/account_len.sim +++ b/tests/script/unique/account/account_len.sim @@ -1,7 +1,5 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec_up.sh -n dnode1 -s start diff --git a/tests/script/unique/account/authority.sim b/tests/script/unique/account/authority.sim index 352e9797e3..e1966e378c 100644 --- a/tests/script/unique/account/authority.sim +++ b/tests/script/unique/account/authority.sim @@ -1,7 +1,5 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/exec_up.sh -n dnode1 -s start diff --git a/tests/script/unique/account/basic.sim b/tests/script/unique/account/basic.sim index 6f64975ac2..b2d8904cc6 100644 --- a/tests/script/unique/account/basic.sim +++ b/tests/script/unique/account/basic.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec_up.sh -n dnode1 -s start sql connect diff --git a/tests/script/unique/account/paras.sim b/tests/script/unique/account/paras.sim index 14ee2f6c85..d1d573d334 100644 --- a/tests/script/unique/account/paras.sim +++ b/tests/script/unique/account/paras.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec_up.sh -n dnode1 -s start sql connect diff --git a/tests/script/unique/account/pass_alter.sim b/tests/script/unique/account/pass_alter.sim index d327d3d4e2..2c15d55544 100644 --- a/tests/script/unique/account/pass_alter.sim +++ b/tests/script/unique/account/pass_alter.sim @@ -1,7 +1,5 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec_up.sh -n dnode1 -s start diff --git a/tests/script/unique/account/pass_len.sim b/tests/script/unique/account/pass_len.sim index 426c18adf7..acf4f50c69 100644 --- a/tests/script/unique/account/pass_len.sim +++ b/tests/script/unique/account/pass_len.sim @@ -1,7 +1,5 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec_up.sh -n dnode1 -s start diff --git a/tests/script/unique/account/testSuite.sim b/tests/script/unique/account/testSuite.sim index dedaf029f7..9d4141cfe0 100644 --- a/tests/script/unique/account/testSuite.sim +++ b/tests/script/unique/account/testSuite.sim @@ -1,12 +1,11 @@ run unique/account/account_create.sim -run unique/account/account_len.sim run unique/account/account_delete.sim -run unique/account/pass_alter.sim -run unique/account/pass_len.sim -run unique/account/user_create.sim -run unique/account/user_len.sim +run unique/account/account_len.sim run unique/account/authority.sim run unique/account/basic.sim run unique/account/paras.sim +run unique/account/pass_alter.sim +run unique/account/pass_len.sim run unique/account/usage.sim -run unique/account/monitor.sim +run unique/account/user_create.sim +run unique/account/user_len.sim diff --git a/tests/script/unique/account/usage.sim b/tests/script/unique/account/usage.sim index 5b334374c9..af904815a0 100644 --- a/tests/script/unique/account/usage.sim +++ b/tests/script/unique/account/usage.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec_up.sh -n dnode1 -s start sql connect diff --git a/tests/script/unique/account/user_create.sim b/tests/script/unique/account/user_create.sim index 97a48cf8f6..b22cefcf21 100644 --- a/tests/script/unique/account/user_create.sim +++ b/tests/script/unique/account/user_create.sim @@ -1,7 +1,5 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec_up.sh -n dnode1 -s start diff --git a/tests/script/unique/account/user_len.sim b/tests/script/unique/account/user_len.sim index 260a0c78b5..0e25f554e0 100644 --- a/tests/script/unique/account/user_len.sim +++ b/tests/script/unique/account/user_len.sim @@ -1,7 +1,5 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec_up.sh -n dnode1 -s start diff --git a/tests/script/unique/big/balance.sim b/tests/script/unique/big/balance.sim index 10d13b4460..32a1396f90 100644 --- a/tests/script/unique/big/balance.sim +++ b/tests/script/unique/big/balance.sim @@ -1,27 +1,27 @@ -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up + + + + + system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c tables -v 1000 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c tables -v 1000 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode3 -c tables -v 1000 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode4 -c tables -v 1000 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 +system sh/deploy.sh -n dnode5 -i 5 system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode5 -c tables -v 1000 @@ -104,8 +104,8 @@ show1: endi sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.2 freeVnodes $data3_192.168.0.2 +print dnode1 freeVnodes $data3_192.168.0.1 +print dnode2 freeVnodes $data3_192.168.0.2 if $data3_192.168.0.1 != 2 then goto show1 endi @@ -160,9 +160,9 @@ show3: endi sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.2 freeVnodes $data3_192.168.0.2 -print 192.168.0.3 freeVnodes $data3_192.168.0.3 +print dnode1 freeVnodes $data3_192.168.0.1 +print dnode2 freeVnodes $data3_192.168.0.2 +print dnode3 freeVnodes $data3_192.168.0.3 if $data3_192.168.0.1 != 2 then goto show3 endi @@ -217,8 +217,8 @@ show4: endi sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.3 freeVnodes $data3_192.168.0.3 +print dnode1 freeVnodes $data3_192.168.0.1 +print dnode3 freeVnodes $data3_192.168.0.3 if $data3_192.168.0.1 != 0 then goto show4 endi @@ -272,8 +272,8 @@ show5: endi sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.4 freeVnodes $data3_192.168.0.4 +print dnode1 freeVnodes $data3_192.168.0.1 +print dnode4 freeVnodes $data3_192.168.0.4 if $data3_192.168.0.1 != 0 then goto show5 endi diff --git a/tests/script/unique/big/maxvnodes.sim b/tests/script/unique/big/maxvnodes.sim index c3802da1f8..7d87dc4744 100644 --- a/tests/script/unique/big/maxvnodes.sim +++ b/tests/script/unique/big/maxvnodes.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/cfg.sh -n dnode1 -c tables -v 100 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 256 @@ -37,8 +37,8 @@ if $data00 != 25600 then return -1 endi -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c clog -v 0 system sh/cfg.sh -n dnode2 -c tables -v 100 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 256 @@ -60,8 +60,8 @@ show3: endi sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.2 freeVnodes $data3_192.168.0.2 +print dnode1 freeVnodes $data3_192.168.0.1 +print dnode2 freeVnodes $data3_192.168.0.2 if $data3_192.168.0.1 != 126 then goto show3 endi diff --git a/tests/script/unique/big/tcp.sim b/tests/script/unique/big/tcp.sim index 5e1b26aade..9e98ddd349 100644 --- a/tests/script/unique/big/tcp.sim +++ b/tests/script/unique/big/tcp.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c tables -v 30000 diff --git a/tests/script/unique/cluster/backup/balance4.sim b/tests/script/unique/cluster/backup/balance4.sim index fbfd6eb36c..a1fe5713f3 100644 --- a/tests/script/unique/cluster/backup/balance4.sim +++ b/tests/script/unique/cluster/backup/balance4.sim @@ -1,24 +1,24 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up -system sh/ip.sh -i 8 -s up + + + + + + + + sleep 1000 -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 -system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 +system sh/deploy.sh -n dnode5 -i 5 +system sh/deploy.sh -n dnode6 -i 6 +system sh/deploy.sh -n dnode7 -i 7 +system sh/deploy.sh -n dnode8 -i 8 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 @@ -161,15 +161,15 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 1 then goto show1 @@ -202,15 +202,15 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode5Vnodes != 2 then @@ -231,15 +231,15 @@ show3: endi sql show dnodes -x show3 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 1 then goto show3 @@ -274,15 +274,15 @@ show4: endi sql show dnodes -x show4 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode2Vnodes != 2 then goto show4 @@ -302,15 +302,15 @@ show5: endi sql show dnodes -x show5 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 1 then goto show5 @@ -345,15 +345,15 @@ show6: endi sql show dnodes -x show6 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode3Vnodes != 2 then goto show6 @@ -373,15 +373,15 @@ show7: endi sql show dnodes -x show7 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 1 then goto show7 @@ -416,15 +416,15 @@ show8: endi sql show dnodes -x show8 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode4Vnodes != 2 then goto show8 @@ -444,15 +444,15 @@ show9: endi sql show dnodes -x show9 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 1 then goto show9 @@ -487,15 +487,15 @@ show10: endi sql show dnodes -x show10 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode5Vnodes != 2 then goto show10 @@ -520,15 +520,15 @@ show11: endi sql show dnodes -x show11 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != null then goto show11 @@ -561,15 +561,15 @@ show12: endi sql show dnodes -x show12 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 2 then goto show12 @@ -621,15 +621,15 @@ show13: endi sql show dnodes -x show13 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 0 then goto show13 diff --git a/tests/script/unique/cluster/backup/balance5.sim b/tests/script/unique/cluster/backup/balance5.sim index 15bc83ab5d..83486bb813 100644 --- a/tests/script/unique/cluster/backup/balance5.sim +++ b/tests/script/unique/cluster/backup/balance5.sim @@ -1,24 +1,24 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up -system sh/ip.sh -i 8 -s up + + + + + + + + sleep 1000 -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 -system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 +system sh/deploy.sh -n dnode5 -i 5 +system sh/deploy.sh -n dnode6 -i 6 +system sh/deploy.sh -n dnode7 -i 7 +system sh/deploy.sh -n dnode8 -i 8 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 @@ -144,15 +144,15 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 2 then goto show1 @@ -202,17 +202,17 @@ show2: endi sql show dnodes -x show2 $dnode1Status = $data4_192.168.0.1 -print 192.168.0.1 $dnode1Status +print dnode1 $dnode1Status $dnode2Status = $data4_192.168.0.2 -print 192.168.0.2 $dnode2Status +print dnode2 $dnode2Status $dnode3Status = $data4_192.168.0.3 -print 192.168.0.3 $dnode3Status +print dnode3 $dnode3Status $dnode4Status = $data4_192.168.0.4 -print 192.168.0.4 $dnode4Status +print dnode4 $dnode4Status $dnode5Status = $data4_192.168.0.5 -print 192.168.0.5 $dnode5Status +print dnode5 $dnode5Status $dnode6Status = $data4_192.168.0.6 -print 192.168.0.6 $dnode6Status +print dnode6 $dnode6Status if $dnode1Status != online then goto show2 @@ -251,17 +251,17 @@ show3: endi sql show dnodes -x show3 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes $dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes +print dnode6 $dnode6Vnodes if $dnode1Vnodes != null then goto show3 diff --git a/tests/script/unique/cluster/backup/balancex.sim b/tests/script/unique/cluster/backup/balancex.sim index 8f1cd191d6..7d4f5f7660 100644 --- a/tests/script/unique/cluster/backup/balancex.sim +++ b/tests/script/unique/cluster/backup/balancex.sim @@ -1,22 +1,22 @@ -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up -system sh/ip.sh -i 8 -s up + + + + + + + + sleep 1000 -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 -system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 +system sh/deploy.sh -n dnode5 -i 5 +system sh/deploy.sh -n dnode6 -i 6 +system sh/deploy.sh -n dnode7 -i 7 +system sh/deploy.sh -n dnode8 -i 8 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 @@ -143,13 +143,13 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then goto show1 @@ -196,17 +196,17 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes $dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes +print dnode6 $dnode6Vnodes if $dnode5Vnodes != 2 then goto show2 @@ -230,17 +230,17 @@ show3: endi sql show dnodes -x show3 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes $dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes +print dnode6 $dnode6Vnodes if $dnode1Vnodes != null then goto show3 diff --git a/tests/script/unique/cluster/balance1.sim b/tests/script/unique/cluster/balance1.sim index 95cfcbd979..6d4e67de0e 100644 --- a/tests/script/unique/cluster/balance1.sim +++ b/tests/script/unique/cluster/balance1.sim @@ -1,19 +1,8 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 - -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 @@ -61,9 +50,9 @@ sql insert into c_b1_t2 values(1520000024021, 21) sql show dnodes $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then return -1 @@ -88,9 +77,9 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 3 then goto show2 @@ -104,10 +93,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step3 print ========= add db3 @@ -134,9 +123,9 @@ show4: endi sql show dnodes -x show4 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 1 then goto show4 @@ -150,17 +139,16 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step5 print ========= add dnode2 system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 3000 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c clog -v 1 @@ -179,9 +167,9 @@ show5: endi sql show dnodes -x show5 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show5 @@ -195,10 +183,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step6 print ========= drop dnode1 @@ -219,9 +207,9 @@ show6: endi sql show dnodes -x show6 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != null then goto show6 @@ -235,16 +223,16 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step7 print ========= add dnode1 sql create dnode 192.168.0.1 sleep 3000 -system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c clog -v 1 @@ -262,9 +250,9 @@ show7: endi sql show dnodes -x show7 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 3 then goto show7 @@ -278,10 +266,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step8 print ========= drop dnode2 @@ -301,9 +289,9 @@ show8: endi sql show dnodes -x show8 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 1 then goto show8 @@ -317,10 +305,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 @@ -329,8 +317,7 @@ endi print ============================== step9 print ========= add dnode2 sql create dnode 192.168.0.2 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c clog -v 1 @@ -348,9 +335,9 @@ show9: endi sql show dnodes -x show9 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show9 @@ -364,10 +351,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step10 print ========= add db4 @@ -389,9 +376,9 @@ show10: endi sql show dnodes -x show10 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show10 @@ -409,8 +396,8 @@ sql insert into c_b1_t2 values(1520000025026, 26) sql show mnodes $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role if $dnode1Role != master then return -1 @@ -431,9 +418,9 @@ show11: endi sql show dnodes -x show11 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 0 then goto show11 @@ -447,10 +434,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role system sh/exec.sh -n dnode2 -s stop -x SIGINT @@ -466,8 +453,7 @@ error3: print ============================== step13 print ========= add dnode2 sql create dnode 192.168.0.2 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c clog -v 1 @@ -481,10 +467,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role sql use c_b1_d5; sql create table c_b1_t5 (t timestamp, i int) @@ -505,9 +491,9 @@ sql insert into c_b1_t6 values(1520000024061, 61) sql show dnodes $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes #if $dnode1Vnodes != 1 then # return -1 @@ -524,10 +510,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role sleep 2000 sql create dnode 192.168.0.3 @@ -543,11 +529,11 @@ show14: endi sql show dnodes -x show14 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 2 then goto show14 @@ -563,9 +549,9 @@ sql show mnodes $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role print ============================== step15 print ========= create db7 db8 @@ -593,10 +579,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ========== add dnode4 sleep 2000 @@ -616,13 +602,13 @@ show15: endi sql show dnodes -x show15 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then goto show15 @@ -662,11 +648,11 @@ show16: endi sql show dnodes -x show16 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 1 then goto show16 diff --git a/tests/script/unique/cluster/balance1_bug.sim b/tests/script/unique/cluster/balance1_bug.sim index 85b38d6c7e..1796d8d2f2 100644 --- a/tests/script/unique/cluster/balance1_bug.sim +++ b/tests/script/unique/cluster/balance1_bug.sim @@ -1,19 +1,8 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 - -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 @@ -61,9 +50,9 @@ sql insert into c_b1_t2 values(now+5s, 21) sql show dnodes $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then return -1 @@ -88,9 +77,9 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 3 then goto show2 @@ -104,10 +93,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step3 print ========= add db3 @@ -134,9 +123,9 @@ show4: endi sql show dnodes -x show4 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 1 then goto show4 @@ -150,10 +139,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step5 print ========= add dnode2 @@ -172,9 +161,9 @@ show5: endi sql show dnodes -x show5 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show5 @@ -188,10 +177,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step6 print ========= drop dnode1 @@ -212,9 +201,9 @@ show6: endi sql show dnodes -x show6 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != null then goto show6 @@ -228,10 +217,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step7 print ========= add dnode1 @@ -249,9 +238,9 @@ show7: endi sql show dnodes -x show7 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 3 then goto show7 @@ -265,10 +254,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step8 print ========= drop dnode2 @@ -288,9 +277,9 @@ show8: endi sql show dnodes -x show8 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 1 then goto show8 @@ -304,10 +293,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 @@ -328,9 +317,9 @@ show9: endi sql show dnodes -x show9 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show9 @@ -344,10 +333,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step10 print ========= add db4 @@ -369,9 +358,9 @@ show10: endi sql show dnodes -x show10 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show10 @@ -389,8 +378,8 @@ sql insert into c_b1_t2 values(now+1s, 25) sql show mnodes $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role if $dnode1Role != master then return -1 @@ -411,9 +400,9 @@ show11: endi sql show dnodes -x show11 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 0 then goto show11 @@ -427,10 +416,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role system sh/exec.sh -n dnode2 -s stop -x SIGINT @@ -454,10 +443,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role sql use c_b1_d5; $x = 0 @@ -492,9 +481,9 @@ sql insert into c_b1_t6 values(now+5s, 61) sql show dnodes $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes #if $dnode1Vnodes != 1 then # return -1 @@ -511,10 +500,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role sleep 2000 sql create dnode 192.168.0.3 @@ -530,11 +519,11 @@ show14: endi sql show dnodes -x show14 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 2 then goto show14 @@ -550,9 +539,9 @@ sql show mnodes $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role print ============================== step15 print ========= create db7 db8 @@ -580,10 +569,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ========== add dnode4 sleep 2000 @@ -603,13 +592,13 @@ show15: endi sql show dnodes -x show15 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then goto show15 @@ -649,11 +638,11 @@ show16: endi sql show dnodes -x show16 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 1 then goto show16 diff --git a/tests/script/unique/cluster/balance1_single.sim b/tests/script/unique/cluster/balance1_single.sim index 497352544d..030d6551e0 100644 --- a/tests/script/unique/cluster/balance1_single.sim +++ b/tests/script/unique/cluster/balance1_single.sim @@ -1,22 +1,9 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 - -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode5 -c secondIp -v 192.168.0.2 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 +system sh/deploy.sh -n dnode5 -i 5 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 @@ -59,9 +46,9 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode2Vnodes +print dnode1 $dnode2Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode3Vnodes +print dnode2 $dnode3Vnodes if $dnode1Vnodes != 4 then goto show1 @@ -92,9 +79,9 @@ sql insert into c_b1_t2 values(now+5s, 21) sql show dnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 2 then return -1 @@ -119,9 +106,9 @@ show2: endi sql show dnodes -x show2 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 3 then goto show2 @@ -135,10 +122,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step3 print ========= add db3 @@ -166,9 +153,9 @@ show4: endi sql show dnodes -x show4 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 1 then goto show4 @@ -182,10 +169,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step5 print ========= add dnode3 @@ -204,9 +191,9 @@ show5: endi sql show dnodes -x show5 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 2 then goto show5 @@ -234,9 +221,9 @@ show6: endi sql show dnodes -x show6 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != null then goto show6 @@ -262,9 +249,9 @@ show7: endi sql show dnodes -x show7 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 3 then goto show7 @@ -291,9 +278,9 @@ show8: endi sql show dnodes -x show8 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 1 then goto show8 @@ -317,9 +304,9 @@ show9: endi sql show dnodes -x show9 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 2 then goto show9 @@ -348,9 +335,9 @@ show10: endi sql show dnodes -x show10 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 2 then goto show10 @@ -379,9 +366,9 @@ show11: endi sql show dnodes -x show11 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 0 then goto show11 @@ -436,9 +423,9 @@ sql insert into c_b1_t6 values(now+5s, 61) sql show dnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes #if $dnode2Vnodes != 1 then # return -1 @@ -462,11 +449,11 @@ show14: endi sql show dnodes -x show14 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode2Vnodes != 2 then goto show14 @@ -517,13 +504,13 @@ show15: endi sql show dnodes -x show15 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode2Vnodes != 2 then goto show15 @@ -563,11 +550,11 @@ show16: endi sql show dnodes -x show16 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode2Vnodes != 1 then goto show16 diff --git a/tests/script/unique/cluster/balance2.sim b/tests/script/unique/cluster/balance2.sim index 65dbfba361..9a0a88b609 100644 --- a/tests/script/unique/cluster/balance2.sim +++ b/tests/script/unique/cluster/balance2.sim @@ -1,27 +1,12 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up -system sh/ip.sh -i 8 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 -system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8 - -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 +system sh/deploy.sh -n dnode5 -i 5 +system sh/deploy.sh -n dnode6 -i 6 +system sh/deploy.sh -n dnode7 -i 7 +system sh/deploy.sh -n dnode8 -i 8 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 @@ -107,11 +92,11 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 2 then goto show1 @@ -137,11 +122,11 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 1 then goto show2 @@ -158,10 +143,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role system sh/exec.sh -n dnode2 -s stop -x SIGINT @@ -170,7 +155,7 @@ print ========= start dnode2 sql create dnode 192.168.0.2 sleep 3000 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c clog -v 1 @@ -189,11 +174,11 @@ show3: endi sql show dnodes -x show3 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 2 then goto show3 @@ -210,10 +195,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step4 print ========= drop dnode3 @@ -229,11 +214,11 @@ show4: endi sql show dnodes -x show4 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 1 then goto show4 @@ -250,10 +235,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role system sh/exec.sh -n dnode3 -s stop -x SIGINT @@ -262,7 +247,7 @@ print ========= start dnode3 sql create dnode 192.168.0.3 sleep 3000 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode3 -c clog -v 1 @@ -281,11 +266,11 @@ show5: endi sql show dnodes -x show5 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 2 then goto show5 @@ -302,10 +287,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step6 print ========= drop dnode1 @@ -326,11 +311,11 @@ show6: endi sql show dnodes -x show6 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != null then goto show6 @@ -347,10 +332,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step7 print ========= start dnode1 @@ -361,13 +346,13 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role sleep 3000 -system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c clog -v 1 @@ -385,10 +370,10 @@ show7: $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 - print 192.168.0.1 ==> $dnode1Role - print 192.168.0.2 ==> $dnode2Role - print 192.168.0.3 ==> $dnode3Role - print 192.168.0.4 ==> $dnode4Role + print dnode1 ==> $dnode1Role + print dnode2 ==> $dnode2Role + print dnode3 ==> $dnode3Role + print dnode4 ==> $dnode4Role $x = $x + 1 sleep 2000 @@ -397,11 +382,11 @@ show7: endi sql show dnodes -x show7 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 2 then goto show7 @@ -434,10 +419,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role $x = 0 show8: @@ -448,13 +433,13 @@ show8: endi sql show dnodes -x show8 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then goto show8 @@ -480,10 +465,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role $x = 0 show9: @@ -494,13 +479,13 @@ show9: endi sql show dnodes -x show9 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != null then goto show9 @@ -524,17 +509,15 @@ sql create dnode 192.168.0.1 sql create dnode 192.168.0.4 sleep 3000 -system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 +system sh/deploy.sh -n dnode1 -i 1 +ssystem sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c clog -v 1 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 0 sleep 3000 sleep 3000 -system sh/deploy.sh -n dnode4 -m 192.168.0.2 -i 192.168.0.4 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode4 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode4 -c clog -v 1 @@ -552,10 +535,10 @@ show10: $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 - print 192.168.0.1 ==> $dnode1Role - print 192.168.0.2 ==> $dnode2Role - print 192.168.0.3 ==> $dnode3Role - print 192.168.0.4 ==> $dnode4Role + print dnode1 ==> $dnode1Role + print dnode2 ==> $dnode2Role + print dnode3 ==> $dnode3Role + print dnode4 ==> $dnode4Role $x = $x + 1 sleep 2000 @@ -564,13 +547,13 @@ show10: endi sql show dnodes -x show10 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then goto show10 @@ -592,10 +575,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role sql create database c_b2_d5 replica 2 tables 4 sql use c_b2_d5; @@ -624,13 +607,13 @@ show11: endi sql show dnodes -x show11 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then goto show11 @@ -650,10 +633,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step12 print ========= check data diff --git a/tests/script/unique/cluster/balance3.sim b/tests/script/unique/cluster/balance3.sim index 83499a4d66..6e5d910a11 100644 --- a/tests/script/unique/cluster/balance3.sim +++ b/tests/script/unique/cluster/balance3.sim @@ -1,22 +1,22 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up -system sh/ip.sh -i 8 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 -system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8 + + + + + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 +system sh/deploy.sh -n dnode5 -i 5 +system sh/deploy.sh -n dnode6 -i 6 +system sh/deploy.sh -n dnode7 -i 7 +system sh/deploy.sh -n dnode8 -i 8 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 @@ -102,13 +102,13 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then goto show1 @@ -138,13 +138,13 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode4Vnodes != 2 then goto show2 @@ -164,13 +164,13 @@ show3: endi sql show dnodes -x show3 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then goto show3 @@ -190,7 +190,7 @@ system sh/exec.sh -n dnode2 -s stop -x SIGINT print ============================== step4 print ========= start dnode2 sleep 3000 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c clog -v 1 @@ -209,13 +209,13 @@ show4: endi sql show dnodes -x show4 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode2Vnodes != 2 then goto show4 @@ -235,13 +235,13 @@ show5: endi sql show dnodes -x show5 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then goto show5 @@ -262,7 +262,7 @@ system sh/exec.sh -n dnode3 -s stop -x SIGINT print ============================== step6 print ========= start dnode3 sleep 3000 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode3 -c clog -v 1 @@ -281,13 +281,13 @@ show6: endi sql show dnodes -x show6 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode3Vnodes != 2 then goto show6 @@ -307,13 +307,13 @@ show7: endi sql show dnodes -x show7 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then goto show7 @@ -333,7 +333,7 @@ system sh/exec.sh -n dnode4 -s stop -x SIGINT print ============================== step8 print ========= start dnode4 sleep 3000 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode4 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode4 -c clog -v 1 @@ -352,13 +352,13 @@ show8: endi sql show dnodes -x show8 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode4Vnodes != 2 then goto show8 @@ -383,13 +383,13 @@ show9: endi sql show dnodes -x show9 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != null then goto show9 @@ -407,7 +407,7 @@ endi print ============================== step10 print ========= start dnode1 sleep 3000 -system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c clog -v 1 @@ -426,13 +426,13 @@ show10: endi sql show dnodes -x show10 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then goto show10 @@ -467,13 +467,13 @@ show11: endi sql show dnodes -x show11 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then goto show11 @@ -502,13 +502,13 @@ show12: endi sql show dnodes -x show12 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != null then goto show12 diff --git a/tests/script/unique/column/replica3.sim b/tests/script/unique/column/replica3.sim index 2ec7879615..97c89f89f3 100644 --- a/tests/script/unique/column/replica3.sim +++ b/tests/script/unique/column/replica3.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/db/commit.sim b/tests/script/unique/db/commit.sim index 7f86f85c97..ec84122b47 100644 --- a/tests/script/unique/db/commit.sim +++ b/tests/script/unique/db/commit.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c commitLog -v 2 system sh/cfg.sh -n dnode2 -c commitLog -v 2 @@ -17,13 +17,13 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4 print ========= start dnode1 as master -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sql connect sleep 3000 print ========= start other dnodes sql create dnode 192.168.0.2 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 3000 print ======== step1 create db @@ -50,9 +50,9 @@ if $data01 != 40 then endi print ======== step2 stop dnode -system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec_up.sh -n dnode2 -s stop -x SIGINT sleep 5000 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 3000 sql select * from tb order by ts desc @@ -101,9 +101,9 @@ if $data01 != 40 then endi print ======== step5 stop dnode -system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec_up.sh -n dnode2 -s stop -x SIGINT sleep 5000 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 3000 sql select * from tb diff --git a/tests/script/unique/db/delete.sim b/tests/script/unique/db/delete.sim index 9262239b04..d22ca2623d 100644 --- a/tests/script/unique/db/delete.sim +++ b/tests/script/unique/db/delete.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 @@ -20,12 +20,12 @@ system sh/cfg.sh -n dnode2 -c cacheBlockSize -v 200 system sh/cfg.sh -n dnode3 -c cacheBlockSize -v 200 print ========= start dnodes -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sql connect sql create dnode 192.168.0.2 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sql create dnode 192.168.0.3 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 3000 print ======== step1 diff --git a/tests/script/unique/db/delete_part.sim b/tests/script/unique/db/delete_part.sim index a0a3356cd0..e599cc6c4a 100644 --- a/tests/script/unique/db/delete_part.sim +++ b/tests/script/unique/db/delete_part.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 @@ -35,10 +35,10 @@ system sh/cfg.sh -n dnode3 -c tables -v 4 system sh/cfg.sh -n dnode4 -c tables -v 4 print ========= start dnodes -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sql connect sql create dnode 192.168.0.2 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 3000 $loop = 0 @@ -59,13 +59,13 @@ begin: endw print ======== step2 - system sh/exec.sh -n dnode2 -s stop + system sh/exec_up.sh -n dnode2 -s stop sql drop database $db print ======== step3 sleep 3000 - system sh/exec.sh -n dnode2 -s start + system sh/exec_up.sh -n dnode2 -s start sleep 20000 print ===> test times : $loop diff --git a/tests/script/unique/db/replica_add12.sim b/tests/script/unique/db/replica_add12.sim index 969a2a2091..b9ce0595c7 100644 --- a/tests/script/unique/db/replica_add12.sim +++ b/tests/script/unique/db/replica_add12.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 @@ -145,7 +145,9 @@ if $rows != 2 then return -1 endi +sql reset query cache sleep 2000 + print ========= step5 system sh/exec_up.sh -n dnode2 -s stop -x SIGINT sleep 5000 @@ -155,7 +157,7 @@ if $rows != 2 then return -1 endi -sql select * from d2.t2 +sql select * from d2.t2 if $rows != 2 then return -1 endi @@ -172,17 +174,44 @@ endi print ===== insert data - sql insert into d1.t1 values(now, 3) -sql insert into d2.t2 values(now, 3) +# no master +sql_error insert into d2.t2 values(now, 3) sql insert into d3.t3 values(now, 3) -sql insert into d4.t4 values(now, 3) +# no master +sql_error insert into d4.t4 values(now, 3) sql select * from d1.t1 if $rows != 3 then return -1 endi +sql select * from d2.t2 +if $rows != 2 then + return -1 +endi + +sql select * from d3.t3 +if $rows != 3 then + return -1 +endi + +sql select * from d4.t4 +if $rows != 2 then + return -1 +endi + +print ========= step6 +system sh/exec_up.sh -n dnode2 -s start +sleep 5000 + +sql insert into d2.t2 values(now, 3) +sql insert into d4.t4 values(now, 3) +sql select * from d1.t1 +if $rows != 3 then + return -1 +endi + sql select * from d2.t2 if $rows != 3 then return -1 @@ -198,32 +227,23 @@ if $rows != 3 then return -1 endi -print ========= step6 -system sh/exec_up.sh -n dnode2 -s start -sleep 10000 -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -sleep 10000 +print ========= step61 -sql insert into d1.t1 values(now, 4) +system sh/exec_up.sh -n dnode3 -s stop -x SIGINT +sleep 5000 + +# no master +sql_error insert into d1.t1 values(now, 4) sql insert into d2.t2 values(now, 4) -sql insert into d3.t3 values(now, 4) +# no master +sql_error insert into d3.t3 values(now, 4) sql insert into d4.t4 values(now, 4) -sql select * from d1.t1 -if $rows != 4 then - return -1 -endi - sql select * from d2.t2 if $rows != 4 then return -1 endi -sql select * from d3.t3 -if $rows != 4 then - return -1 -endi - sql select * from d4.t4 if $rows != 4 then return -1 @@ -231,9 +251,7 @@ endi print ========= step7 system sh/exec_up.sh -n dnode3 -s start -sleep 10000 -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -sleep 10000 +sleep 5000 sql insert into d1.t1 values(now, 5) sql insert into d2.t2 values(now, 5) @@ -241,7 +259,7 @@ sql insert into d3.t3 values(now, 5) sql insert into d4.t4 values(now, 5) sql select * from d1.t1 -if $rows != 5 then +if $rows != 4 then return -1 endi @@ -251,7 +269,7 @@ if $rows != 5 then endi sql select * from d3.t3 -if $rows != 5 then +if $rows != 4 then return -1 endi diff --git a/tests/script/unique/db/replica_add13.sim b/tests/script/unique/db/replica_add13.sim index fd5515f1a8..0c44d9d839 100644 --- a/tests/script/unique/db/replica_add13.sim +++ b/tests/script/unique/db/replica_add13.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 @@ -30,14 +30,14 @@ system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 print ========= start dnodes -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sql connect sql create dnode 192.168.0.2 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sql create dnode 192.168.0.3 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sql create dnode 192.168.0.4 -system sh/exec.sh -n dnode4 -s start +system sh/exec_up.sh -n dnode4 -s start sleep 3000 print ======== step1 @@ -81,7 +81,7 @@ sql alter database d1 replica 3 sql alter database d2 replica 3 sql alter database d3 replica 3 sql alter database d4 replica 3 -sleep 12000 +sleep 10000 print ======== step3 $x = 0 @@ -93,29 +93,25 @@ show3: endi sql show dnodes -print dnode192.168.0.1 ==> openVnodes: $data2_192.168.0.1 freeVnodes: $data3_192.168.0.1 -print dnode192.168.0.2 ==> openVnodes: $data2_192.168.0.2 freeVnodes: $data3_192.168.0.2 -print dnode192.168.0.3 ==> openVnodes: $data2_192.168.0.3 freeVnodes: $data3_192.168.0.3 -print dnode192.168.0.4 ==> openVnodes: $data2_192.168.0.4 freeVnodes: $data3_192.168.0.4 +print dnode192.168.0.1 ==> openVnodes: $data3_1 +print dnode192.168.0.2 ==> openVnodes: $data3_2 +print dnode192.168.0.3 ==> openVnodes: $data3_3 +print dnode192.168.0.4 ==> openVnodes: $data3_4 -if $data2_192.168.0.1 != 0 then - goto show3 +if $data3_1 != 0 then + return -1 endi -if $data3_192.168.0.1 != 4 then - goto show3 +if $data3_2 != 4 then + return -1 endi -if $data3_192.168.0.2 != 0 then - goto show3 +if $data3_3 != 4 then + return -1 endi -if $data3_192.168.0.3 != 0 then - goto show3 -endi - -if $data3_192.168.0.4 != 0 then - goto show3 +if $data3_3 != 4 then + return -1 endi print ======== step4 @@ -145,9 +141,10 @@ if $rows != 2 then endi print ========= step5 -sleep 10000 -system sh/exec.sh -n dnode2 -s stop -x SIGINT -sleep 3000 +sql reset query cache +sleep 1000 +system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +sleep 5000 sql insert into d1.t1 values(now, 3) sql insert into d2.t2 values(now, 3) @@ -175,9 +172,9 @@ if $rows != 3 then endi print ========= step6 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 5000 -system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec_up.sh -n dnode3 -s stop -x SIGINT sleep 3000 sql insert into d1.t1 values(now, 4) @@ -206,9 +203,9 @@ if $rows != 4 then endi print ========= step7 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 5000 -system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec_up.sh -n dnode4 -s stop -x SIGINT sleep 3000 sql insert into d1.t1 values(now, 5) @@ -237,9 +234,9 @@ if $rows != 5 then endi print ========= step8 -system sh/exec.sh -n dnode4 -s start +system sh/exec_up.sh -n dnode4 -s start sleep 5000 -system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec_up.sh -n dnode2 -s stop -x SIGINT sleep 3000 sql insert into d1.t1 values(now, 6) diff --git a/tests/script/unique/db/replica_add23.sim b/tests/script/unique/db/replica_add23.sim index 9aea2e5a4a..e1cc5767c5 100644 --- a/tests/script/unique/db/replica_add23.sim +++ b/tests/script/unique/db/replica_add23.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 @@ -30,14 +30,14 @@ system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 print ========= start dnodes -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sql connect sql create dnode 192.168.0.2 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sql create dnode 192.168.0.3 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sql create dnode 192.168.0.4 -system sh/exec.sh -n dnode4 -s start +system sh/exec_up.sh -n dnode4 -s start sleep 3000 print ======== step1 @@ -81,7 +81,7 @@ sql alter database d1 replica 3 sql alter database d2 replica 3 sql alter database d3 replica 3 sql alter database d4 replica 3 -sleep 12000 +sleep 10000 print ======== step3 $x = 0 @@ -93,41 +93,25 @@ show3: endi sql show dnodes -print dnode192.168.0.1 ==> openVnodes: $data2_192.168.0.1 freeVnodes: $data3_192.168.0.1 -print dnode192.168.0.2 ==> openVnodes: $data2_192.168.0.2 freeVnodes: $data3_192.168.0.2 -print dnode192.168.0.3 ==> openVnodes: $data2_192.168.0.3 freeVnodes: $data3_192.168.0.3 -print dnode192.168.0.4 ==> openVnodes: $data2_192.168.0.4 freeVnodes: $data3_192.168.0.4 +print dnode192.168.0.1 ==> openVnodes: $data3_1 +print dnode192.168.0.2 ==> openVnodes: $data3_2 +print dnode192.168.0.3 ==> openVnodes: $data3_3 +print dnode192.168.0.4 ==> openVnodes: $data3_4 -if $data2_192.168.0.1 != 0 then - goto show3 +if $data3_1 != 0 then + return -1 endi -if $data2_192.168.0.2 != 4 then - goto show3 +if $data3_2 != 4 then + return -1 endi -if $data2_192.168.0.3 != 4 then - goto show3 +if $data3_3 != 4 then + return -1 endi -if $data2_192.168.0.4 != 4 then - goto show3 -endi - -if $data3_192.168.0.1 != 4 then - goto show3 -endi - -if $data3_192.168.0.2 != 0 then - goto show3 -endi - -if $data3_192.168.0.3 != 0 then - goto show3 -endi - -if $data3_192.168.0.4 != 0 then - goto show3 +if $data3_3 != 4 then + return -1 endi print ======== step4 @@ -156,10 +140,12 @@ if $rows != 2 then return -1 endi -sleep 10000 +sql reset query cache +sleep 1000 + print ========= step5 -system sh/exec.sh -n dnode2 -s stop -x SIGINT -sleep 3000 +system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +sleep 5000 sql insert into d1.t1 values(now, 3) sql insert into d2.t2 values(now, 3) @@ -187,10 +173,10 @@ if $rows != 3 then endi print ========= step6 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start +sleep 5000 +system sh/exec_up.sh -n dnode3 -s stop -x SIGINT sleep 5000 -system sh/exec.sh -n dnode3 -s stop -x SIGINT -sleep 3000 sql insert into d1.t1 values(now, 4) sql insert into d2.t2 values(now, 4) @@ -218,10 +204,10 @@ if $rows != 4 then endi print ========= step7 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start +sleep 5000 +system sh/exec_up.sh -n dnode4 -s stop -x SIGINT sleep 5000 -system sh/exec.sh -n dnode4 -s stop -x SIGINT -sleep 3000 sql insert into d1.t1 values(now, 5) sql insert into d2.t2 values(now, 5) @@ -249,10 +235,10 @@ if $rows != 5 then endi print ========= step8 -system sh/exec.sh -n dnode4 -s start +system sh/exec_up.sh -n dnode4 -s start +sleep 5000 +system sh/exec_up.sh -n dnode2 -s stop -x SIGINT sleep 5000 -system sh/exec.sh -n dnode2 -s stop -x SIGINT -sleep 3000 sql insert into d1.t1 values(now, 6) sql insert into d2.t2 values(now, 6) diff --git a/tests/script/unique/db/replica_part.sim b/tests/script/unique/db/replica_part.sim index f1b037a9d9..d8075434dc 100644 --- a/tests/script/unique/db/replica_part.sim +++ b/tests/script/unique/db/replica_part.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 @@ -20,12 +20,12 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 print ========= start dnodes -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sql connect sql create dnode 192.168.0.2 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sql create dnode 192.168.0.3 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 3000 print ======== step1 @@ -65,16 +65,16 @@ if $rows != 1 then endi print ========= step2 alter db -system sh/exec.sh -n dnode2 -s stop -x SIGINT -sleep 3000 +system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +sleep 5000 sql alter database d1 replica 2 sql alter database d2 replica 2 sql alter database d3 replica 2 sql alter database d4 replica 2 -sleep 3000 +sleep 5000 print ========= step3 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 10000 print ========= step4 @@ -104,70 +104,39 @@ if $rows != 2 then endi print ========= step5 -system sh/exec.sh -n dnode2 -s stop -x SIGINT -sleep 3000 +system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +sleep 5000 -sql insert into d1.t1 values(now, 3) -sql insert into d2.t2 values(now, 3) -sql insert into d3.t3 values(now, 3) -sql insert into d4.t4 values(now, 3) +sql reset query cache +sleep 1000 -sql select * from d1.t1 -if $rows != 3 then - return -1 -endi - -sql select * from d2.t2 -if $rows != 3 then - return -1 -endi - -sql select * from d3.t3 -if $rows != 3 then - return -1 -endi - -sql select * from d4.t4 -if $rows != 3 then - return -1 -endi +sql insert into d1.t1 values(now, 3) -x s1 +s1: +sql insert into d2.t2 values(now, 3) -x s2 +s2: +sql insert into d3.t3 values(now, 3) -x s3 +s3: +sql insert into d4.t4 values(now, 3) -x s4 +s4: print ========= step6 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start +sleep 5000 +system sh/exec_up.sh -n dnode3 -s stop -x SIGINT sleep 5000 -system sh/exec.sh -n dnode3 -s stop -x SIGINT -sleep 3000 -sql insert into d1.t1 values(now, 4) -sql insert into d2.t2 values(now, 4) -sql insert into d3.t3 values(now, 4) -sql insert into d4.t4 values(now, 4) - -sql select * from d1.t1 -if $rows != 4 then - return -1 -endi - -sql select * from d2.t2 -if $rows != 4 then - return -1 -endi - -sql select * from d3.t3 -if $rows != 4 then - return -1 -endi - -sql select * from d4.t4 -if $rows != 4 then - return -1 -endi +sql insert into d1.t1 values(now, 4) -x s5 +s5: +sql insert into d2.t2 values(now, 4) -x s6 +s6: +sql insert into d3.t3 values(now, 4) -x s7 +s7: +sql insert into d4.t4 values(now, 4) -x s8 +s8: print ========= step7 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 5000 -system sh/exec.sh -n dnode2 -s stop -x SIGINT -sleep 3000 sql insert into d1.t1 values(now, 5) sql insert into d2.t2 values(now, 5) @@ -175,22 +144,6 @@ sql insert into d3.t3 values(now, 5) sql insert into d4.t4 values(now, 5) sql select * from d1.t1 -if $rows != 5 then - return -1 -endi - sql select * from d2.t2 -if $rows != 5 then - return -1 -endi - sql select * from d3.t3 -if $rows != 5 then - return -1 -endi - sql select * from d4.t4 -if $rows != 5 then - return -1 -endi - diff --git a/tests/script/unique/db/replica_reduce21.sim b/tests/script/unique/db/replica_reduce21.sim index 085d07b714..09d295125a 100644 --- a/tests/script/unique/db/replica_reduce21.sim +++ b/tests/script/unique/db/replica_reduce21.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 @@ -20,10 +20,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 print ========= start dnodes -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sql connect sql create dnode 192.168.0.2 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 3000 print ======== step1 @@ -70,7 +70,7 @@ error1: print ========= step3 alter d1 sql alter database d1 replica 1 -sleep 8000 +sleep 12000 print ========= step4 query d1 sql insert into d1.t1 values(now, 2) @@ -86,16 +86,12 @@ sql select * from d5.t5 if $rows != 1 then return -1 endi - -print ========= step6 alter d5 -sql alter database d5 replica 2 -x error2 - return -1 -error2: - +return print ========= step7 drop d1 sql drop database d1 -sleep 12000 +sleep 5000 +sql reset query cache print ========= step8 sql insert into d5.t5 values(now, 2) sql insert into d2.t2 values(now, 2) @@ -123,7 +119,7 @@ if $rows != 2 then endi print ======== step9 stop dnode2 -system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec_up.sh -n dnode2 -s stop -x SIGINT sleep 3000 sql insert into d5.t5 values(now, 3) diff --git a/tests/script/unique/db/replica_reduce31.sim b/tests/script/unique/db/replica_reduce31.sim index 1190d688aa..214b064afb 100644 --- a/tests/script/unique/db/replica_reduce31.sim +++ b/tests/script/unique/db/replica_reduce31.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 @@ -20,12 +20,12 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 print ========= start dnodes -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sql connect sql create dnode 192.168.0.2 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sql create dnode 192.168.0.3 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 3000 print ======== step1 @@ -39,8 +39,8 @@ sql create table d2.t2 (ts timestamp, i int) sql create table d3.t3 (ts timestamp, i int) sql create table d4.t4 (ts timestamp, i int) -sql insert into d2.t2 values(now, 1) sql insert into d1.t1 values(now, 1) +sql insert into d2.t2 values(now, 1) sql insert into d3.t3 values(now, 1) sql insert into d4.t4 values(now, 1) @@ -65,12 +65,25 @@ if $rows != 1 then endi print ========= step2 alter db +sql_error alter database d1 replica 1 +sql_error alter database d2 replica 1 +sql_error alter database d3 replica 1 +sql alter database d1 replica 2 +sql alter database d2 replica 2 +sql alter database d3 replica 2 + +sleep 8000 + sql alter database d1 replica 1 sql alter database d2 replica 1 sql alter database d3 replica 1 -sleep 12000 + +sleep 8000 print ========= step3 +sql reset query cache +sleep 1000 + sql insert into d1.t1 values(now, 2) sql insert into d2.t2 values(now, 2) sql insert into d3.t3 values(now, 2) @@ -100,7 +113,7 @@ print ========= step4 alter db sql alter database d1 replica 2 sql alter database d2 replica 2 sql alter database d3 replica 2 -sleep 12000 +sleep 8000 sql insert into d1.t1 values(now, 3) sql insert into d2.t2 values(now, 3) @@ -128,93 +141,46 @@ if $rows != 3 then endi print ========= step4 -system sh/exec.sh -n dnode2 -s stop -x SIGINT -sleep 3000 +system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +sleep 5000 -sql insert into d1.t1 values(now, 4) -sql insert into d2.t2 values(now, 4) -sql insert into d3.t3 values(now, 4) -sql insert into d4.t4 values(now, 4) - -sql select * from d1.t1 -if $rows != 4 then - return -1 -endi - -sql select * from d2.t2 -if $rows != 4 then - return -1 -endi - -sql select * from d3.t3 -if $rows != 4 then - return -1 -endi - -sql select * from d4.t4 -if $rows != 4 then - return -1 -endi +sql reset query cache +sleep 1000 +sql insert into d1.t1 values(now, 4) -x step1 +step1: +sql insert into d2.t2 values(now, 4) -x step2 +step2: +sql insert into d3.t3 values(now, 4) -x step3 +step3: +sql insert into d4.t4 values(now, 4) -x step4 +step4: print ========= step5 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start +sleep 5000 +system sh/exec_up.sh -n dnode3 -s stop -x SIGINT sleep 5000 -system sh/exec.sh -n dnode3 -s stop -x SIGINT -sleep 3000 - -sql insert into d1.t1 values(now, 5) -sql insert into d2.t2 values(now, 5) -sql insert into d3.t3 values(now, 5) -sql insert into d4.t4 values(now, 5) - -sql select * from d1.t1 -if $rows != 5 then - return -1 -endi - -sql select * from d2.t2 -if $rows != 5 then - return -1 -endi - -sql select * from d3.t3 -if $rows != 5 then - return -1 -endi - -sql select * from d4.t4 -if $rows != 5 then - return -1 -endi +sql insert into d1.t1 values(now, 5) -x step5 +step5: +sql insert into d2.t2 values(now, 5) -x step6 +step6: +sql insert into d3.t3 values(now, 5) -x step7 +step7: +sql insert into d4.t4 values(now, 5) -x step8 +step8: print ========= step6 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 5000 -system sh/exec.sh -n dnode2 -s stop -x SIGINT -sleep 3000 + sql insert into d1.t1 values(now, 6) sql insert into d2.t2 values(now, 6) sql insert into d3.t3 values(now, 6) sql insert into d4.t4 values(now, 6) sql select * from d1.t1 -if $rows != 6 then - return -1 -endi - sql select * from d2.t2 -if $rows != 6 then - return -1 -endi - sql select * from d3.t3 -if $rows != 6 then - return -1 -endi - sql select * from d4.t4 -if $rows != 6 then - return -1 -endi diff --git a/tests/script/unique/db/replica_reduce32.sim b/tests/script/unique/db/replica_reduce32.sim index cdb5ada79b..c1d4893a3e 100644 --- a/tests/script/unique/db/replica_reduce32.sim +++ b/tests/script/unique/db/replica_reduce32.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 @@ -20,12 +20,12 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 print ========= start dnodes -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sql connect sql create dnode 192.168.0.2 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sql create dnode 192.168.0.3 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 3000 print ======== step1 @@ -68,6 +68,7 @@ print ========= step2 alter db sql alter database d1 replica 2 sql alter database d2 replica 2 sql alter database d3 replica 2 +sql alter database d4 replica 2 sleep 12000 print ========= step3 @@ -97,8 +98,8 @@ if $rows != 2 then endi print ========= step4 -system sh/exec.sh -n dnode2 -s stop -x SIGINT -sleep 3000 +system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +sleep 5000 sql insert into d1.t1 values(now, 3) sql insert into d2.t2 values(now, 3) @@ -126,40 +127,24 @@ if $rows != 3 then endi print ========= step5 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start + +sleep 5000 +system sh/exec_up.sh -n dnode3 -s stop -x SIGINT sleep 5000 -system sh/exec.sh -n dnode3 -s stop -x SIGINT -sleep 3000 -sql insert into d1.t1 values(now, 4) -sql insert into d2.t2 values(now, 4) -sql insert into d3.t3 values(now, 4) -sql insert into d4.t4 values(now, 4) +sql reset query cache +sleep 1000 -sql select * from d1.t1 -if $rows != 4 then - return -1 -endi - -sql select * from d2.t2 -if $rows != 4 then - return -1 -endi - -sql select * from d3.t3 -if $rows != 4 then - return -1 -endi - -sql select * from d4.t4 -if $rows != 4 then - return -1 -endi +sql_error insert into d1.t1 values(now, 4) +sql_error insert into d2.t2 values(now, 4) +sql_error insert into d3.t3 values(now, 4) +sql_error insert into d4.t4 values(now, 4) print ========= step6 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 5000 -system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec_up.sh -n dnode2 -s stop -x SIGINT sleep 3000 sql insert into d1.t1 values(now, 5) @@ -168,21 +153,21 @@ sql insert into d3.t3 values(now, 5) sql insert into d4.t4 values(now, 5) sql select * from d1.t1 -if $rows != 5 then +if $rows != 4 then return -1 endi sql select * from d2.t2 -if $rows != 5 then +if $rows != 4 then return -1 endi sql select * from d3.t3 -if $rows != 5 then +if $rows != 4 then return -1 endi sql select * from d4.t4 -if $rows != 5 then +if $rows != 4 then return -1 endi diff --git a/tests/script/unique/db/testSuite.sim b/tests/script/unique/db/testSuite.sim index a370668860..4918850426 100644 --- a/tests/script/unique/db/testSuite.sim +++ b/tests/script/unique/db/testSuite.sim @@ -1,5 +1,5 @@ #run unique/db/commit.sim -run unique/db/delete.sim +#run unique/db/delete.sim run unique/db/replica_add12.sim run unique/db/replica_add13.sim run unique/db/replica_add23.sim @@ -7,4 +7,4 @@ run unique/db/replica_reduce21.sim run unique/db/replica_reduce32.sim run unique/db/replica_reduce31.sim run unique/db/replica_part.sim -run unique/db/delete_part.sim +#run unique/db/delete_part.sim diff --git a/tests/script/unique/dnode/backup/balance4.sim b/tests/script/unique/dnode/backup/balance4.sim deleted file mode 100644 index 914f254ef2..0000000000 --- a/tests/script/unique/dnode/backup/balance4.sim +++ /dev/null @@ -1,435 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 - -system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode3 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode4 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode5 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode6 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode7 -c numOfMPeers -v 1 - -system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode6 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode7 -c numOfTotalVnodes -v 4 - -system sh/cfg.sh -n dnode1 -c statusInterval -v 1 -system sh/cfg.sh -n dnode2 -c statusInterval -v 1 -system sh/cfg.sh -n dnode3 -c statusInterval -v 1 -system sh/cfg.sh -n dnode4 -c statusInterval -v 1 -system sh/cfg.sh -n dnode5 -c statusInterval -v 1 -system sh/cfg.sh -n dnode6 -c statusInterval -v 1 -system sh/cfg.sh -n dnode7 -c statusInterval -v 1 - -system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode3 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode4 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode5 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode6 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode7 -c balanceMonitorInterval -v 1 - -system sh/cfg.sh -n dnode1 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode2 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode3 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode4 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode5 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode6 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode7 -c balanceStartInterval -v 10 - -system sh/cfg.sh -n dnode1 -c commitLog -v 0 -system sh/cfg.sh -n dnode2 -c commitLog -v 0 -system sh/cfg.sh -n dnode3 -c commitLog -v 0 -system sh/cfg.sh -n dnode4 -c commitLog -v 0 -system sh/cfg.sh -n dnode5 -c commitLog -v 0 -system sh/cfg.sh -n dnode6 -c commitLog -v 0 -system sh/cfg.sh -n dnode7 -c commitLog -v 0 - -system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode5 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode6 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode7 -c mgmtEqualVnodeNum -v 4 - -print ============================ step1 -print ========= start dnode1-5 -system sh/exec.sh -n dnode1 -s start -sleep 4001 -$x = 0 -connectTbase: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi -sql connect -x connectTbase - -sql create dnode 192.168.0.2 -sql create dnode 192.168.0.3 -sql create dnode 192.168.0.4 -sql create dnode 192.168.0.5 -system sh/exec.sh -n dnode2 -s start -system sh/exec.sh -n dnode3 -s start -system sh/exec.sh -n dnode4 -s start -system sh/exec.sh -n dnode5 -s start -sleep 4001 -$x = 0 -created1: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi -sql create database d_b4_d1 replica 4 -x created1 -sql use d_b4_d1 - -create1: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi -sql create table d_b4_d1 (t timestamp, i int) -x create1 -sql insert into d_b4_d1 values(now+1s, 15) -sql insert into d_b4_d1 values(now+2s, 14) -sql insert into d_b4_d1 values(now+2s, 13) -sql insert into d_b4_d1 values(now+3s, 12) -sql insert into d_b4_d1 values(now+4s, 11) - -sql create database d_b4_d2 replica 4 -sql use d_b4_d2 - -create2: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi -sql create table d_b4_d2 (t timestamp, i int) -x create2 -sql insert into d_b4_d2 values(now+1s, 25) -sql insert into d_b4_d2 values(now+2s, 24) -sql insert into d_b4_d2 values(now+3s, 23) -sql insert into d_b4_d2 values(now+4s, 22) -sql insert into d_b4_d2 values(now+5s, 21) - -$x = 0 -show1: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show1 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes - -if $dnode1Vnodes != 4 then - goto show1 -endi -if $dnode2Vnodes != 2 then - goto show1 -endi -if $dnode3Vnodes != 2 then - goto show1 -endi -if $dnode4Vnodes != 2 then - goto show1 -endi -if $dnode5Vnodes != 2 then - goto show1 -endi - -print ============================ step2 -print ========= drop dnode2 -sql drop dnode 192.168.0.2 -sleep 7000 -$x = 0 -show2: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show2 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes - -if $dnode1Vnodes != 2 then - goto show2 -endi -if $dnode3Vnodes != 2 then - goto show2 -endi -if $dnode4Vnodes != 2 then - goto show2 -endi -if $dnode5Vnodes != 2 then - goto show2 -endi - -system sh/exec.sh -n dnode2 -s stop - -print ============================ step3 -print ========= start dnode6 -sql create dnode 192.168.0.6 -system sh/exec.sh -n dnode6 -s start -sleep 4000 -$x = 0 -show3: - $x = $x + 1 - sleep 6000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show3 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes - -if $dnode1Vnodes != 4 then - goto show3 -endi -if $dnode3Vnodes != 2 then - goto show3 -endi -if $dnode4Vnodes != 2 then - goto show3 -endi -if $dnode5Vnodes != 2 then - goto show3 -endi -if $dnode6Vnodes != 2 then - goto show3 -endi - -print ============================ step4 -print ========= add db3 -sql create database d_b4_d3 replica 4 -sql use d_b4_d3 - -create3: - $x = $x + 1 - sleep 1000 - if $x == 20 then - return -1 - endi -sql create table d_b4_d3 (t timestamp, i int) -x create3 -sql insert into d_b4_d3 values(now+1s, 35) -sql insert into d_b4_d3 values(now+2s, 34) -sql insert into d_b4_d3 values(now+3s, 33) -sql insert into d_b4_d3 values(now+4s, 32) -sql insert into d_b4_d3 values(now+5s, 31) - -$x = 0 -show4: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show4 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes - -if $dnode1Vnodes != 4 then - goto show4 -endi -if $dnode3Vnodes != 1 then - goto show4 -endi -if $dnode4Vnodes != 1 then - goto show4 -endi -if $dnode5Vnodes != 1 then - goto show4 -endi -if $dnode6Vnodes != 1 then - goto show4 -endi - -print ============================ step5 -print ========= start dnode7 -sql create dnode 192.168.0.7 -system sh/exec.sh -n dnode7 -s start -sleep 7000 -$x = 0 -show5: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show5 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode7Vnodes = $data3_192.168.0.7 -print 192.168.0.7 $dnode7Vnodes - -if $dnode1Vnodes != 4 then - goto show5 -endi -if $dnode7Vnodes != 2 then - goto show5 -endi - -print ============================ step6 -print ========= drop dnode3 -sql drop dnode 192.168.0.3 -sleep 7000 -$x = 0 -show6: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show6 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes -$dnode7Vnodes = $data3_192.168.0.7 -print 192.168.0.7 $dnode7Vnodes - -if $dnode1Vnodes != 4 then - goto show6 -endi -if $dnode4Vnodes != 1 then - goto show6 -endi -if $dnode5Vnodes != 1 then - goto show6 -endi -if $dnode6Vnodes != 1 then - goto show6 -endi -if $dnode7Vnodes != 1 then - goto show6 -endi - -system sh/exec.sh -n dnode3 -s stop - -return -print ============================ step7 -print ========= check data - -sql use d_b4_d1 -sql select * from d_b4_d1 -print $data01 $data11 $data21 $data31 $data41 -if $data01 != 11 then - return -1 -endi -if $data11 != 12 then - return -1 -endi -if $data21 != 13 then - return -1 -endi -if $data31 != 14 then - return -1 -endi -if $data41 != 15 then - return -1 -endi - -sql use d_b4_d2 -sql select * from d_b4_d2 -print $data01 $data11 $data21 $data31 $data41 -if $data01 != 21 then - return -1 -endi -if $data11 != 22 then - return -1 -endi -if $data21 != 23 then - return -1 -endi -if $data31 != 24 then - return -1 -endi -if $data41 != 25 then - return -1 -endi - -sql use d_b4_d3 -sql select * from d_b4_d3 -print $data01 $data11 $data21 $data31 $data41 -if $data01 != 31 then - return -1 -endi -if $data11 != 32 then - return -1 -endi -if $data21 != 33 then - return -1 -endi -if $data31 != 34 then - return -1 -endi -if $data41 != 35 then - return -1 -endi - - -print ============================================ over -system sh/exec.sh -n dnode1 -s stop -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode3 -s stop -system sh/exec.sh -n dnode4 -s stop -system sh/exec.sh -n dnode5 -s stop -system sh/exec.sh -n dnode6 -s stop -system sh/exec.sh -n dnode7 -s stop diff --git a/tests/script/unique/dnode/backup/balance5.sim b/tests/script/unique/dnode/backup/balance5.sim deleted file mode 100644 index ac6157ca93..0000000000 --- a/tests/script/unique/dnode/backup/balance5.sim +++ /dev/null @@ -1,469 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 -system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8 - -system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode3 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode4 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode5 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode6 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode7 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode8 -c numOfMPeers -v 1 - -system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode6 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode7 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode8 -c numOfTotalVnodes -v 4 - -system sh/cfg.sh -n dnode1 -c statusInterval -v 1 -system sh/cfg.sh -n dnode2 -c statusInterval -v 1 -system sh/cfg.sh -n dnode3 -c statusInterval -v 1 -system sh/cfg.sh -n dnode4 -c statusInterval -v 1 -system sh/cfg.sh -n dnode5 -c statusInterval -v 1 -system sh/cfg.sh -n dnode6 -c statusInterval -v 1 -system sh/cfg.sh -n dnode7 -c statusInterval -v 1 -system sh/cfg.sh -n dnode8 -c statusInterval -v 1 - -system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode3 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode4 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode5 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode6 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode7 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode8 -c balanceMonitorInterval -v 1 - -system sh/cfg.sh -n dnode1 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode2 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode3 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode4 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode5 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode6 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode7 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode8 -c balanceStartInterval -v 10 - -system sh/cfg.sh -n dnode1 -c commitLog -v 0 -system sh/cfg.sh -n dnode2 -c commitLog -v 0 -system sh/cfg.sh -n dnode3 -c commitLog -v 0 -system sh/cfg.sh -n dnode4 -c commitLog -v 0 -system sh/cfg.sh -n dnode5 -c commitLog -v 0 -system sh/cfg.sh -n dnode6 -c commitLog -v 0 -system sh/cfg.sh -n dnode7 -c commitLog -v 0 -system sh/cfg.sh -n dnode8 -c commitLog -v 0 - -system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode5 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode6 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode7 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode8 -c mgmtEqualVnodeNum -v 4 - -print ============================ step1 -print ========= start dnode1-5 -system sh/exec.sh -n dnode1 -s start - -$x = 0 -connectTbase: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi -sql connect -x connectTbase -sleep 4001 -sql create dnode 192.168.0.2 -sql create dnode 192.168.0.3 -sql create dnode 192.168.0.4 -sql create dnode 192.168.0.5 -sql create dnode 192.168.0.6 -system sh/exec.sh -n dnode2 -s start -system sh/exec.sh -n dnode3 -s start -system sh/exec.sh -n dnode4 -s start -system sh/exec.sh -n dnode5 -s start -system sh/exec.sh -n dnode6 -s start -sleep 4001 -$x = 0 -created1: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi -sql create database d_b5_d1 replica 5 -x created1 -sql use d_b5_d1 - -create1: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi -sql create table d_b5_t1 (t timestamp, i int) -x create1 -sql insert into d_b5_t1 values(now+1s, 15) -sql insert into d_b5_t1 values(now+2s, 14) -sql insert into d_b5_t1 values(now+2s, 13) -sql insert into d_b5_t1 values(now+3s, 12) -sql insert into d_b5_t1 values(now+4s, 11) - -sql create database d_b5_d2 replica 5 -sql use d_b5_d2 -create2: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi -sql create table d_b5_t2 (t timestamp, i int) -x create2 -sql insert into d_b5_t2 values(now+1s, 25) -sql insert into d_b5_t2 values(now+2s, 24) -sql insert into d_b5_t2 values(now+3s, 23) -sql insert into d_b5_t2 values(now+4s, 22) -sql insert into d_b5_t2 values(now+5s, 21) - -$x = 0 -show1: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show1 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes - -if $dnode1Vnodes != 4 then - goto show1 -endi -if $dnode2Vnodes != 2 then - goto show1 -endi -if $dnode3Vnodes != 2 then - goto show1 -endi -if $dnode4Vnodes != 2 then - goto show1 -endi -if $dnode5Vnodes != 2 then - goto show1 -endi -if $dnode6Vnodes != 2 then - goto show1 -endi - -print ============================ step2 -print ========= drop dnode2 -sql drop dnode 192.168.0.2 -sleep 7000 -$x = 0 -show2: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show2 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes - -if $dnode1Vnodes != 2 then - goto show2 -endi -if $dnode3Vnodes != 2 then - goto show2 -endi -if $dnode4Vnodes != 2 then - goto show2 -endi -if $dnode5Vnodes != 2 then - goto show2 -endi -if $dnode6Vnodes != 2 then - goto show2 -endi - -system sh/exec.sh -n dnode2 -s stop - -print ============================ step3 -print ========= start dnode7 -sql create dnode 192.168.0.7 -system sh/exec.sh -n dnode7 -s start -sleep 5000 -$x = 0 -show3: - $x = $x + 1 - sleep 5000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show3 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes -$dnode7Vnodes = $data3_192.168.0.7 -print 192.168.0.7 $dnode7Vnodes - -if $dnode1Vnodes != 4 then - goto show3 -endi -if $dnode3Vnodes != 2 then - goto show3 -endi -if $dnode4Vnodes != 2 then - goto show3 -endi -if $dnode5Vnodes != 2 then - goto show3 -endi -if $dnode6Vnodes != 2 then - goto show3 -endi -if $dnode7Vnodes != 2 then - goto show3 -endi - -print ============================ step4 -print ========= add db3 -sql create database d_b5_d3 replica 5 -sql use d_b5_d3 -create3: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql create table d_b5_t3 (t timestamp, i int) -x create3 -sql insert into d_b5_t3 values(now+1s, 35) -sql insert into d_b5_t3 values(now+2s, 34) -sql insert into d_b5_t3 values(now+3s, 33) -sql insert into d_b5_t3 values(now+4s, 32) -sql insert into d_b5_t3 values(now+5s, 31) - -$x = 0 -show4: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show4 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes -$dnode7Vnodes = $data3_192.168.0.7 -print 192.168.0.7 $dnode7Vnodes - -if $dnode1Vnodes != 4 then - goto show4 -endi -if $dnode3Vnodes != 1 then - goto show4 -endi -if $dnode4Vnodes != 1 then - goto show4 -endi -if $dnode5Vnodes != 1 then - goto show4 -endi -if $dnode6Vnodes != 1 then - goto show4 -endi -if $dnode7Vnodes != 1 then - goto show4 -endi - -print ============================ step5 -print ========= start dnode8 -sql create dnode 192.168.0.8 -system sh/exec.sh -n dnode8 -s start -sleep 7000 -$x = 0 -show5: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show5 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode8Vnodes = $data3_192.168.0.8 -print 192.168.0.8 $dnode8Vnodes - -if $dnode1Vnodes != 4 then - goto show5 -endi -if $dnode8Vnodes != 2 then - goto show5 -endi - -print ============================ step6 -print ========= drop dnode3 -sql drop dnode 192.168.0.3 -sleep 7000 -$x = 0 -show6: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show6 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes -$dnode7Vnodes = $data3_192.168.0.7 -print 192.168.0.7 $dnode7Vnodes -$dnode8Vnodes = $data3_192.168.0.8 -print 192.168.0.8 $dnode8Vnodes - -if $dnode1Vnodes != 4 then - goto show6 -endi -if $dnode4Vnodes != 1 then - goto show6 -endi -if $dnode5Vnodes != 1 then - goto show6 -endi -if $dnode6Vnodes != 1 then - goto show6 -endi -if $dnode7Vnodes != 1 then - goto show6 -endi -if $dnode8Vnodes != 1 then - goto show6 -endi - -system sh/exec.sh -n dnode3 -s stop - -return -print ============================ step7 -print ========= check data - -sql use d_b5_d1 -sql select * from d_b5_t1 -print $data01 $data11 $data21 $data31 $data41 -if $data01 != 11 then - return -1 -endi -if $data11 != 12 then - return -1 -endi -if $data21 != 13 then - return -1 -endi -if $data31 != 14 then - return -1 -endi -if $data41 != 15 then - return -1 -endi - -sql use d_b5_d2 -sql select * from d_b5_t2 -print $data01 $data11 $data21 $data31 $data41 -if $data01 != 21 then - return -1 -endi -if $data11 != 22 then - return -1 -endi -if $data21 != 23 then - return -1 -endi -if $data31 != 24 then - return -1 -endi -if $data41 != 25 then - return -1 -endi - -sql use d_b5_d3 -sql select * from d_b5_t3 -print $data01 $data11 $data21 $data31 $data41 -if $data01 != 31 then - return -1 -endi -if $data11 != 32 then - return -1 -endi -if $data21 != 33 then - return -1 -endi -if $data31 != 34 then - return -1 -endi -if $data41 != 35 then - return -1 -endi - - -print ============================================ over -system sh/exec.sh -n dnode1 -s stop -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode3 -s stop -system sh/exec.sh -n dnode4 -s stop -system sh/exec.sh -n dnode5 -s stop -system sh/exec.sh -n dnode6 -s stop -system sh/exec.sh -n dnode7 -s stop -system sh/exec.sh -n dnode8 -s stop diff --git a/tests/script/unique/dnode/backup/unremove.sim b/tests/script/unique/dnode/backup/unremove.sim deleted file mode 100644 index 75aaeb949b..0000000000 --- a/tests/script/unique/dnode/backup/unremove.sim +++ /dev/null @@ -1,149 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 - -system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode3 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode4 -c balanceMonitorInterval -v 1 - -system sh/cfg.sh -n dnode1 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode2 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode3 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode4 -c balanceStartInterval -v 10 - -system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4 - -system sh/cfg.sh -n dnode1 -c commitLog -v 1 -system sh/cfg.sh -n dnode2 -c commitLog -v 1 -system sh/cfg.sh -n dnode3 -c commitLog -v 1 -system sh/cfg.sh -n dnode4 -c commitLog -v 1 - -print ========== step1 -system sh/exec.sh -n dnode1 -s start -sql connect -sql create dnode 192.168.0.2 -sql create dnode 192.168.0.3 -system sh/exec.sh -n dnode2 -s start -system sh/exec.sh -n dnode3 -s start -sleep 3000 - -sql create database d1 replica 3 -sql create table d1.t1 (t timestamp, i int) -sql insert into d1.t1 values(now+1s, 15) -sql insert into d1.t1 values(now+2s, 14) -sql insert into d1.t1 values(now+2s, 13) -sql insert into d1.t1 values(now+3s, 12) -sql insert into d1.t1 values(now+4s, 11) - -print ========== step2 -sql drop dnode 192.168.0.2 -system sh/exec.sh -n dnode2 -s stop -x SIGINT -sleep 3000 - -sql alter dnode 192.168.0.2 unremove -system sh/exec.sh -n dnode2 -s start - -sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.2 freeVnodes $data3_192.168.0.2 -print 192.168.0.3 freeVnodes $data3_192.168.0.3 -if $data3_192.168.0.1 != 3 then - return -1 -endi -if $data3_192.168.0.2 != 3 then - return -endi -if $data3_192.168.0.3 != 3 then - return -1 -endi - -print ========== step3 -sql drop dnode 192.168.0.2 -system sh/exec.sh -n dnode2 -s stop -x SIGINT -sleep 3000 - -sql alter dnode 192.168.0.2 unremove -system sh/exec.sh -n dnode2 -s start - -sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.2 freeVnodes $data3_192.168.0.2 -print 192.168.0.3 freeVnodes $data3_192.168.0.3 -if $data3_192.168.0.1 != 3 then - return -1 -endi -if $data3_192.168.0.2 != 3 then - return -1 -endi -if $data3_192.168.0.3 != 3 then - return -1 -endi - -print ========== step4 -sql create dnode 192.168.0.4 -sql drop dnode 192.168.0.2 - -sleep 5000 -sql show dnodes -$dnode1Vnodes = $data2_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode2Vnodes = $data2_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes -$dnode3Vnodes = $data2_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes - -sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.2 freeVnodes $data3_192.168.0.2 -print 192.168.0.3 freeVnodes $data3_192.168.0.3 -if $data3_192.168.0.1 != 3 then - return -1 -endi -if $data3_192.168.0.2 != 3 then - return -1 -endi -if $data3_192.168.0.3 != 3 then - return -1 -endi - -print ========== step5 -system sh/exec.sh -n dnode4 -s start -sleep 3000 - -$x = 0 -show5: - $x = $x + 1 - sleep 5000 - if $x == 20 then - return -1 - endi - -sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.2 freeVnodes $data3_192.168.0.2 -print 192.168.0.3 freeVnodes $data3_192.168.0.3 -print 192.168.0.4 freeVnodes $data3_192.168.0.4 -if $data3_192.168.0.1 != 3 then - goto show5 -endi -if $data3_192.168.0.2 != null then - goto show5 -endi -if $data3_192.168.0.3 != 3 then - goto show5 -endi -if $data3_192.168.0.4 != 3 then - goto show5 -endi diff --git a/tests/script/unique/dnode/balance1.sim b/tests/script/unique/dnode/balance1.sim index 555ca3cd6b..eff6b1e51d 100644 --- a/tests/script/unique/dnode/balance1.sim +++ b/tests/script/unique/dnode/balance1.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 @@ -49,7 +49,7 @@ sql insert into d1.t1 values(now+4s, 12) sql insert into d1.t1 values(now+5s, 11) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 +print dnode1 openVnodes $data3_1 if $data3_1 != 1 then return -1 endi @@ -68,8 +68,8 @@ show2: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 0 then goto show2 endi @@ -87,8 +87,8 @@ sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 0 then return -1 endi @@ -108,8 +108,8 @@ show4: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 2 then goto show4 endi @@ -135,9 +135,9 @@ show5: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 0 then goto show5 endi @@ -158,9 +158,9 @@ sql insert into d3.t3 values(now+4s, 32) sql insert into d3.t3 values(now+5s, 31) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 0 then return -1 @@ -185,10 +185,10 @@ show7: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 if $data3_1 != 0 then goto show7 endi @@ -212,10 +212,10 @@ sql insert into d4.t4 values(now+4s, 42) sql insert into d4.t4 values(now+5s, 41) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 if $data3_1 != 0 then return -1 @@ -242,10 +242,10 @@ show9: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 if $data3_1 != 0 then goto show9 @@ -262,6 +262,9 @@ endi system sh/exec_up.sh -n dnode3 -s stop -x SIGINT +sql reset query cache +sleep 1000 + print ========== step10 sql select * from d1.t1 order by t desc print $data01 $data11 $data21 $data31 $data41 diff --git a/tests/script/unique/dnode/balance2.sim b/tests/script/unique/dnode/balance2.sim index 5e887d54f5..d38952ea4f 100644 --- a/tests/script/unique/dnode/balance2.sim +++ b/tests/script/unique/dnode/balance2.sim @@ -1,16 +1,16 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 + + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 +system sh/deploy.sh -n dnode5 -i 5 system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 @@ -63,9 +63,9 @@ sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 4 then return -1 endi @@ -88,9 +88,9 @@ show2: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 2 then goto show2 endi @@ -116,10 +116,10 @@ show3: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 if $data3_1 != 4 then goto show3 endi @@ -143,10 +143,10 @@ sql insert into d3.t3 values(now+4s, 32) sql insert into d3.t3 values(now+5s, 31) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 if $data3_1 != 4 then return -1 endi @@ -173,11 +173,11 @@ show5: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 -print 192.168.0.5 openVnodes $data3_5 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 +print dnode5 openVnodes $data3_5 if $data3_1 != 4 then goto show5 endi @@ -206,11 +206,11 @@ show6: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 -print 192.168.0.5 openVnodes $data3_5 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 +print dnode5 openVnodes $data3_5 if $data3_1 != 4 then goto show6 endi diff --git a/tests/script/unique/dnode/balance3.sim b/tests/script/unique/dnode/balance3.sim index 7baa6444ee..b379b50119 100644 --- a/tests/script/unique/dnode/balance3.sim +++ b/tests/script/unique/dnode/balance3.sim @@ -1,18 +1,18 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 + + + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 +system sh/deploy.sh -n dnode5 -i 5 +system sh/deploy.sh -n dnode6 -i 6 system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 @@ -71,10 +71,10 @@ sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 if $data3_1 != 4 then return -1 @@ -101,10 +101,10 @@ show2: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 if $data3_1 != 2 then goto show2 @@ -134,11 +134,11 @@ show3: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 -print 192.168.0.5 openVnodes $data3_5 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 +print dnode5 openVnodes $data3_5 if $data3_1 != 4 then goto show3 @@ -174,11 +174,11 @@ show4: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 -print 192.168.0.5 openVnodes $data3_5 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 +print dnode5 openVnodes $data3_5 if $data3_1 != 4 then goto show4 @@ -209,11 +209,11 @@ show5: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 -print 192.168.0.5 openVnodes $data3_5 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 +print dnode5 openVnodes $data3_5 if $data3_1 != 4 then goto show5 @@ -236,11 +236,11 @@ show6: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 -print 192.168.0.5 openVnodes $data3_5 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 +print dnode5 openVnodes $data3_5 if $data3_1 != 4 then goto show6 diff --git a/tests/script/unique/dnode/balancex.sim b/tests/script/unique/dnode/balancex.sim index 9153224a22..78046d3638 100644 --- a/tests/script/unique/dnode/balancex.sim +++ b/tests/script/unique/dnode/balancex.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 @@ -52,7 +52,7 @@ sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 +print dnode1 openVnodes $data3_1 if $data3_1 != 2 then return -1 endi @@ -70,8 +70,8 @@ show2: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 4 then goto show2 endi @@ -96,8 +96,8 @@ show3: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 3 then goto show3 endi @@ -117,9 +117,9 @@ show4: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 4 then goto show4 endi @@ -141,9 +141,9 @@ show5: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 3 then goto show5 endi diff --git a/tests/script/unique/dnode/basic1.sim b/tests/script/unique/dnode/basic1.sim index cfd84bbc16..1d1f16c760 100644 --- a/tests/script/unique/dnode/basic1.sim +++ b/tests/script/unique/dnode/basic1.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/exec_up.sh -n dnode1 -s start system sh/exec_up.sh -n dnode2 -s start sql connect diff --git a/tests/script/unique/dnode/monitor_bug.sim b/tests/script/unique/dnode/monitor_bug.sim index c95ddac43c..a2e650ed71 100644 --- a/tests/script/unique/dnode/monitor_bug.sim +++ b/tests/script/unique/dnode/monitor_bug.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 @@ -27,7 +27,7 @@ sql connect sleep 5000 sql show dnodes -print 192.168.0.1 openVnodes $data3_1 +print dnode1 openVnodes $data3_1 if $data3_1 != 3 then return -1 endi @@ -45,8 +45,8 @@ show2: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 4 then goto show2 endi diff --git a/tests/script/unique/dnode/offline1.sim b/tests/script/unique/dnode/offline1.sim index d61971a439..71053f378a 100644 --- a/tests/script/unique/dnode/offline1.sim +++ b/tests/script/unique/dnode/offline1.sim @@ -1,12 +1,12 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 diff --git a/tests/script/unique/dnode/offline2.sim b/tests/script/unique/dnode/offline2.sim index 9a0bfd18b7..9f265d398a 100644 --- a/tests/script/unique/dnode/offline2.sim +++ b/tests/script/unique/dnode/offline2.sim @@ -1,12 +1,12 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 diff --git a/tests/script/unique/dnode/remove1.sim b/tests/script/unique/dnode/remove1.sim index 76429cdd22..5b18c981b4 100644 --- a/tests/script/unique/dnode/remove1.sim +++ b/tests/script/unique/dnode/remove1.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 @@ -52,7 +52,7 @@ sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 +print dnode1 openVnodes $data3_1 if $data3_1 != 2 then return -1 endi @@ -79,8 +79,8 @@ show2: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 3 then goto show2 endi @@ -101,8 +101,8 @@ show3: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 $data5_192.168.0.2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 $data5_192.168.0.2 print ========== step4 sql create dnode 192.168.0.3 @@ -117,9 +117,9 @@ show4: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_2 != null then goto show4 endi @@ -138,10 +138,10 @@ show5: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 if $data3_1 != 4 then goto show5 endi diff --git a/tests/script/unique/dnode/remove2.sim b/tests/script/unique/dnode/remove2.sim index 9b808920a6..338322fb6e 100644 --- a/tests/script/unique/dnode/remove2.sim +++ b/tests/script/unique/dnode/remove2.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 @@ -52,7 +52,7 @@ sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 +print dnode1 openVnodes $data3_1 if $data3_1 != 2 then return -1 endi @@ -79,8 +79,8 @@ show2: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 3 then goto show2 endi @@ -102,8 +102,8 @@ show3: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 $data5_192.168.0.2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 $data5_192.168.0.2 print ========== step4 sql create dnode 192.168.0.3 @@ -118,9 +118,9 @@ show4: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_2 != null then goto show4 endi diff --git a/tests/script/unique/dnode/vnode_clean.sim b/tests/script/unique/dnode/vnode_clean.sim index 2ce9645108..d670a6b3b7 100644 --- a/tests/script/unique/dnode/vnode_clean.sim +++ b/tests/script/unique/dnode/vnode_clean.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 @@ -43,7 +43,7 @@ sql insert into d1.t1 values(now+4s, 12) sql insert into d1.t1 values(now+5s, 11) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 +print dnode1 openVnodes $data3_1 if $data3_1 != 3 then return -1 endi @@ -60,8 +60,8 @@ show2: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 4 then goto show2 endi @@ -81,8 +81,8 @@ sql insert into d2.t2 values(now+5s, 21) $x = 0 sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 4 then return -1 endi @@ -101,8 +101,8 @@ show4: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 2 then goto show4 endi @@ -118,9 +118,8 @@ system sh/exec_up.sh -n dnode2 -s stop -x SIGINT print ========== step5 sleep 2000 sql create dnode 192.168.0.2 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 system sh/cfg.sh -n dnode2 -c balanceStartInterval -v 10 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4 @@ -135,8 +134,8 @@ show5: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 4 then goto show5 endi @@ -154,8 +153,8 @@ sql insert into d3.t3 values(now+4s, 32) sql insert into d3.t3 values(now+5s, 31) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 4 then return -1 endi @@ -176,9 +175,9 @@ show7: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 4 then goto show7 endi @@ -206,9 +205,9 @@ show8: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 4 then goto show8 endi @@ -231,9 +230,9 @@ show9: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 4 then goto show9 endi diff --git a/tests/script/unique/http/admin.sim b/tests/script/unique/http/admin.sim index b09acd614d..e1237617a8 100644 --- a/tests/script/unique/http/admin.sim +++ b/tests/script/unique/http/admin.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 #system sh/cfg.sh -n dnode1 -c adminRowLimit -v 10 system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135 diff --git a/tests/script/unique/http/opentsdb.sim b/tests/script/unique/http/opentsdb.sim index 985f1827db..36fba4c24e 100644 --- a/tests/script/unique/http/opentsdb.sim +++ b/tests/script/unique/http/opentsdb.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/unique/import/replica2.sim b/tests/script/unique/import/replica2.sim index ec806d71a0..ec9bf8d3f5 100644 --- a/tests/script/unique/import/replica2.sim +++ b/tests/script/unique/import/replica2.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 @@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0 system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c commitlog -v 0 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 - print ========= start dnode1 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/unique/import/replica3.sim b/tests/script/unique/import/replica3.sim index 4dfa26a6b2..99e46a8506 100644 --- a/tests/script/unique/import/replica3.sim +++ b/tests/script/unique/import/replica3.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 @@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0 system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c commitlog -v 0 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 - print ========= start dnode1 system sh/exec.sh -n dnode1 -s start sleep 5000 diff --git a/tests/script/unique/metrics/balance_replica1.sim b/tests/script/unique/metrics/balance_replica1.sim index 35c20986cb..eaa6a14e41 100644 --- a/tests/script/unique/metrics/balance_replica1.sim +++ b/tests/script/unique/metrics/balance_replica1.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c statusInterval -v 1 @@ -71,9 +71,9 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 0 then goto show1 @@ -95,9 +95,9 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show2 diff --git a/tests/script/unique/metrics/dnode2.sim b/tests/script/unique/metrics/dnode2.sim index 68000fb046..449f49b7d7 100644 --- a/tests/script/unique/metrics/dnode2.sim +++ b/tests/script/unique/metrics/dnode2.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 diff --git a/tests/script/unique/metrics/dnode2_stop.sim b/tests/script/unique/metrics/dnode2_stop.sim index 2570e0789f..90af978e6d 100644 --- a/tests/script/unique/metrics/dnode2_stop.sim +++ b/tests/script/unique/metrics/dnode2_stop.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 diff --git a/tests/script/unique/metrics/dnode3.sim b/tests/script/unique/metrics/dnode3.sim index 1e7dcffc24..44f6687d42 100644 --- a/tests/script/unique/metrics/dnode3.sim +++ b/tests/script/unique/metrics/dnode3.sim @@ -1,11 +1,11 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 @@ -82,11 +82,11 @@ endi sql show dnodes $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 3 then return -1 diff --git a/tests/script/unique/metrics/replica2_dnode4.sim b/tests/script/unique/metrics/replica2_dnode4.sim index 8f2f4a9c0c..a1ffb65b0f 100644 --- a/tests/script/unique/metrics/replica2_dnode4.sim +++ b/tests/script/unique/metrics/replica2_dnode4.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/metrics/replica2_vnode3.sim b/tests/script/unique/metrics/replica2_vnode3.sim index ab808b8603..aed98aceff 100644 --- a/tests/script/unique/metrics/replica2_vnode3.sim +++ b/tests/script/unique/metrics/replica2_vnode3.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 diff --git a/tests/script/unique/metrics/replica3_dnode6.sim b/tests/script/unique/metrics/replica3_dnode6.sim index 799633b8f0..974bc793ad 100644 --- a/tests/script/unique/metrics/replica3_dnode6.sim +++ b/tests/script/unique/metrics/replica3_dnode6.sim @@ -1,18 +1,18 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 + + + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 +system sh/deploy.sh -n dnode5 -i 5 +system sh/deploy.sh -n dnode6 -i 6 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/unique/metrics/replica3_vnode3.sim b/tests/script/unique/metrics/replica3_vnode3.sim index aee839e80f..379b7357c7 100644 --- a/tests/script/unique/metrics/replica3_vnode3.sim +++ b/tests/script/unique/metrics/replica3_vnode3.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/mnode/backup/mgmt44.sim b/tests/script/unique/mnode/backup/mgmt44.sim deleted file mode 100644 index 6eb70c7fb2..0000000000 --- a/tests/script/unique/mnode/backup/mgmt44.sim +++ /dev/null @@ -1,240 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 - -system sh/cfg.sh -n dnode1 -c numOfMPeers -v 4 -system sh/cfg.sh -n dnode2 -c numOfMPeers -v 4 -system sh/cfg.sh -n dnode3 -c numOfMPeers -v 4 -system sh/cfg.sh -n dnode4 -c numOfMPeers -v 4 - -print ============================ step1 -print ========= start dnode1 -system sh/exec.sh -n dnode1 -s start - -$x = 0 -connectTbase: - $x = $x + 1 - sleep 1000 - if $x == 20 then - return -1 - endi -sql connect -x connectTbase - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi - -print ============================ step2 -print ========= start dnode2 -system sh/exec.sh -n dnode2 -s start -sql create dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi - -print ============================ step3 -print ========= start dnode3 -system sh/exec.sh -n dnode3 -s start -sql create dnode 192.168.0.3 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != null then - return -1 -endi - -print ============================ step4 -print ========= start dnode4 -system sh/exec.sh -n dnode4 -s start -sql create dnode 192.168.0.4 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi - -print ============================ step5 -print ========= drop dnode2 -sql drop dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode2 -s start - -print ============================ step6 -print ========= create dnode2 -sql create dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi - -print ============================ step7 -print ========= stop dnode1 -system sh/exec.sh -n dnode1 -s stop -sleep 10000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != undecided then - return -1 -endi - -print ============================ step8 -print ========= drop dnode1 -sql drop dnode 192.168.0.1 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != null then - return -1 -endi - -system sh/exec.sh -n dnode1 -s stop -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode3 -s stop -system sh/exec.sh -n dnode4 -s stop \ No newline at end of file diff --git a/tests/script/unique/mnode/backup/mgmt45.sim b/tests/script/unique/mnode/backup/mgmt45.sim deleted file mode 100644 index 53b02847e6..0000000000 --- a/tests/script/unique/mnode/backup/mgmt45.sim +++ /dev/null @@ -1,336 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 - -system sh/cfg.sh -n dnode1 -c numOfMPeers -v 4 -system sh/cfg.sh -n dnode2 -c numOfMPeers -v 4 -system sh/cfg.sh -n dnode3 -c numOfMPeers -v 4 -system sh/cfg.sh -n dnode4 -c numOfMPeers -v 4 -system sh/cfg.sh -n dnode5 -c numOfMPeers -v 4 - -print ============================ step1 -print ========= start dnode1 -system sh/exec.sh -n dnode1 -s start - -$x = 0 -connectTbase: - $x = $x + 1 - sleep 1000 - if $x == 20 then - return -1 - endi -sql connect -x connectTbase - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step2 -print ========= start dnode2 -system sh/exec.sh -n dnode2 -s start -sql create dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step3 -print ========= start dnode3 -system sh/exec.sh -n dnode3 -s start -sql create dnode 192.168.0.3 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step4 -print ========= start dnode4 -system sh/exec.sh -n dnode4 -s start -sql create dnode 192.168.0.4 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step5 -print ========= start dnode5 -system sh/exec.sh -n dnode5 -s start -sql create dnode 192.168.0.5 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step6 -print ========= drop dnode2 -sql drop dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode2 -s start - -print ============================ step7 -print ========= create dnode2 -sql create dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -print ============================ step8 -print ========= stop dnode1 -system sh/exec.sh -n dnode1 -s stop -sleep 14000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != undecided then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != master then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -print ============================ step9 -print ========= stop dnode1 -sql drop dnode 192.168.0.1 -sleep 8000 -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != null then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != master then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -system sh/exec.sh -n dnode1 -s stop -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode3 -s stop -system sh/exec.sh -n dnode4 -s stop -system sh/exec.sh -n dnode5 -s stop \ No newline at end of file diff --git a/tests/script/unique/mnode/backup/mgmt55.sim b/tests/script/unique/mnode/backup/mgmt55.sim deleted file mode 100644 index 0e2b9fa2ef..0000000000 --- a/tests/script/unique/mnode/backup/mgmt55.sim +++ /dev/null @@ -1,328 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 - -system sh/cfg.sh -n dnode1 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode2 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode3 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode4 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode5 -c tsNumOfMPeers -v 5 - -print ============================ step1 -print ========= start dnode1 -system sh/exec.sh -n dnode1 -s start -sleep 4000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step2 -print ========= start dnode2 -system sh/exec.sh -n dnode2 -s start -sql create dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step3 -print ========= start dnode3 -system sh/exec.sh -n dnode3 -s start -sql create dnode 192.168.0.3 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step4 -print ========= start dnode4 -system sh/exec.sh -n dnode4 -s start -sql create dnode 192.168.0.4 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step5 -print ========= start dnode5 -system sh/exec.sh -n dnode5 -s start -sql create dnode 192.168.0.5 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -print ============================ step6 -print ========= drop dnode2 -sql drop dnode 192.168.0.2 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode2 -s start - -print ============================ step7 -print ========= create dnode2 -sql create dnode 192.168.0.2 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -print ============================ step8 -print ========= stop dnode1 -system sh/exec.sh -n dnode1 -s stop -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != undecided then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != master then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -print ============================ step9 -print ========= stop dnode1 -sql drop dnode 192.168.0.1 -sleep 8000 -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != null then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != master then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -system sh/exec.sh -n dnode1 -s stop -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode3 -s stop -system sh/exec.sh -n dnode4 -s stop -system sh/exec.sh -n dnode5 -s stop \ No newline at end of file diff --git a/tests/script/unique/mnode/backup/mgmt56.sim b/tests/script/unique/mnode/backup/mgmt56.sim deleted file mode 100644 index 3171ed855d..0000000000 --- a/tests/script/unique/mnode/backup/mgmt56.sim +++ /dev/null @@ -1,394 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 - -system sh/cfg.sh -n dnode1 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode2 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode3 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode4 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode5 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode6 -c tsNumOfMPeers -v 5 - -print ============================ step1 -print ========= start dnode1 -system sh/exec.sh -n dnode1 -s start -sleep 4000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step2 -print ========= start dnode2 -system sh/exec.sh -n dnode2 -s start -sql create dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step3 -print ========= start dnode3 -system sh/exec.sh -n dnode3 -s start -sql create dnode 192.168.0.3 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step4 -print ========= start dnode4 -system sh/exec.sh -n dnode4 -s start -sql create dnode 192.168.0.4 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step5 -print ========= start dnode5 -system sh/exec.sh -n dnode5 -s start -sql create dnode 192.168.0.5 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - - -print ============================ step6 -print ========= start dnode6 -system sh/exec.sh -n dnode6 -s start -sql create dnode 192.168.0.6 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi -if $dnode6Role != null then - return -1 -endi - -print ============================ step7 -print ========= drop dnode2 -sql drop dnode 192.168.0.2 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi -if $dnode6Role != slave then - return -1 -endi - -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode2 -s start - -print ============================ step8 -print ========= create dnode2 -sql create dnode 192.168.0.2 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi -if $dnode6Role != slave then - return -1 -endi - -print ============================ step9 -print ========= stop dnode1 -system sh/exec.sh -n dnode1 -s stop -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - -if $dnode1Role != undecided then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != master then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi -if $dnode6Role != slave then - return -1 -endi - -print ============================ step10 -print ========= stop dnode1 -sql drop dnode 192.168.0.1 -sleep 8000 -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - - -if $dnode1Role != null then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != master then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi -if $dnode6Role != slave then - return -1 -endi - -system sh/exec.sh -n dnode1 -s stop -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode3 -s stop -system sh/exec.sh -n dnode4 -s stop -system sh/exec.sh -n dnode5 -s stop -system sh/exec.sh -n dnode6 -s stop \ No newline at end of file diff --git a/tests/script/unique/mnode/backup/mgmt57.sim b/tests/script/unique/mnode/backup/mgmt57.sim deleted file mode 100644 index 8c6950a8df..0000000000 --- a/tests/script/unique/mnode/backup/mgmt57.sim +++ /dev/null @@ -1,408 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 - -system sh/cfg.sh -n dnode1 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode2 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode3 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode4 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode5 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode6 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode7 -c tsNumOfMPeers -v 5 - -print ============================ step1 -print ========= start dnode1 -system sh/exec.sh -n dnode1 -s start -sleep 4000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step2 -print ========= start dnode2 -system sh/exec.sh -n dnode2 -s start -sql create dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step3 -print ========= start dnode3 -system sh/exec.sh -n dnode3 -s start -sql create dnode 192.168.0.3 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step4 -print ========= start dnode4 -system sh/exec.sh -n dnode4 -s start -sql create dnode 192.168.0.4 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step5 -print ========= start dnode5 -system sh/exec.sh -n dnode5 -s start -sql create dnode 192.168.0.5 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - - -print ============================ step6 -print ========= start dnode6 -system sh/exec.sh -n dnode6 -s start -sql create dnode 192.168.0.6 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi -if $dnode6Role != null then - return -1 -endi - - -print ============================ step7 -print ========= start dnode7 -system sh/exec.sh -n dnode7 -s start -sql create dnode 192.168.0.7 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi -if $dnode6Role != null then - return -1 -endi - -print ============================ step8 -print ========= drop dnode2 -sql drop dnode 192.168.0.2 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode2 -s start - -print ============================ step9 -print ========= create dnode2 -sql create dnode 192.168.0.2 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -print ============================ step10 -print ========= stop dnode1 -system sh/exec.sh -n dnode1 -s stop -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - -if $dnode1Role != undecided then - return -1 -endi -if $dnode3Role != master then - return -1 -endi - -print ============================ step11 -print ========= stop dnode1 -sql drop dnode 192.168.0.1 -sleep 8000 -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - - -if $dnode1Role != null then - return -1 -endi -if $dnode3Role != master then - return -1 -endi - -system sh/exec.sh -n dnode1 -s stop -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode3 -s stop -system sh/exec.sh -n dnode4 -s stop -system sh/exec.sh -n dnode5 -s stop -system sh/exec.sh -n dnode6 -s stop -system sh/exec.sh -n dnode7 -s stop \ No newline at end of file diff --git a/tests/script/unique/mnode/mgmt22.sim b/tests/script/unique/mnode/mgmt22.sim index f6e54ffc2f..5e2b5623e3 100644 --- a/tests/script/unique/mnode/mgmt22.sim +++ b/tests/script/unique/mnode/mgmt22.sim @@ -1,35 +1,26 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 - print ============== step1 system sh/exec_up.sh -n dnode1 -s start sql connect sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then return -1 endi print ============== step2 system sh/exec_up.sh -n dnode2 -s start -sql create dnode 192.168.0.2 +sql create dnode $hostname2 $x = 0 show2: @@ -40,12 +31,12 @@ show2: endi sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then goto show2 endi -if $data3_2 != slave then +if $data2_2 != slave then goto show2 endi @@ -64,6 +55,8 @@ print error of no master print ============== step6 system sh/exec_up.sh -n dnode1 -s start +sql close +sql connect $x = 0 show6: @@ -74,12 +67,12 @@ show6: endi sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then goto show6 endi -if $data3_2 != slave then +if $data2_2 != slave then goto show6 endi @@ -97,13 +90,13 @@ show7: endi sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -print 192.168.0.3 ==> $data3_3 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +print dnode3 ==> $data3_3 +if $data2_1 != master then goto show7 endi -if $data3_2 != slave then +if $data2_2 != slave then goto show7 endi if $data3_3 != null then diff --git a/tests/script/unique/mnode/mgmt23.sim b/tests/script/unique/mnode/mgmt23.sim index c5ab9e27ea..6e2f0c8f56 100644 --- a/tests/script/unique/mnode/mgmt23.sim +++ b/tests/script/unique/mnode/mgmt23.sim @@ -1,29 +1,20 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 - print ============== step1 system sh/exec_up.sh -n dnode1 -s start sql connect sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then return -1 endi @@ -40,12 +31,12 @@ show2: endi sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then goto show2 endi -if $data3_2 != slave then +if $data2_2 != slave then goto show2 endi @@ -58,9 +49,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -80,9 +71,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -99,9 +90,8 @@ system sh/exec_up.sh -n dnode2 -s stop print ============== step5 sleep 2000 sql create dnode 192.168.0.2 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.3 system sh/exec_up.sh -n dnode2 -s start sleep 8000 @@ -109,9 +99,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 diff --git a/tests/script/unique/mnode/mgmt24.sim b/tests/script/unique/mnode/mgmt24.sim index 9418fd3398..22454c8b5f 100644 --- a/tests/script/unique/mnode/mgmt24.sim +++ b/tests/script/unique/mnode/mgmt24.sim @@ -1,29 +1,20 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 - print ============== step1 system sh/exec_up.sh -n dnode1 -s start sql connect sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then return -1 endi @@ -40,12 +31,12 @@ show2: endi sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then goto show2 endi -if $data3_2 != slave then +if $data2_2 != slave then goto show2 endi @@ -60,6 +51,9 @@ print ============== step5 system sh/exec_up.sh -n dnode1 -s start sql_error create dnode 192.168.0.1 +sql close +sql connect + $x = 0 step5: $x = $x + 1 @@ -70,12 +64,12 @@ step5: sql show mnodes -x step5 -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then goto step5 endi -if $data3_2 != slave then +if $data2_2 != slave then goto step5 endi diff --git a/tests/script/unique/mnode/mgmt25.sim b/tests/script/unique/mnode/mgmt25.sim index 4f5e2bf3c8..652492db45 100644 --- a/tests/script/unique/mnode/mgmt25.sim +++ b/tests/script/unique/mnode/mgmt25.sim @@ -1,29 +1,20 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 - print ============== step1 system sh/exec_up.sh -n dnode1 -s start sql connect sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then return -1 endi @@ -40,12 +31,12 @@ show2: endi sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then goto show2 endi -if $data3_2 != slave then +if $data2_2 != slave then goto show2 endi @@ -58,9 +49,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -80,9 +71,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 diff --git a/tests/script/unique/mnode/mgmt26.sim b/tests/script/unique/mnode/mgmt26.sim index 57c6003431..5ad095db0b 100644 --- a/tests/script/unique/mnode/mgmt26.sim +++ b/tests/script/unique/mnode/mgmt26.sim @@ -1,29 +1,20 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 - print ============== step1 system sh/exec_up.sh -n dnode1 -s start sql connect sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then return -1 endi @@ -40,12 +31,12 @@ show2: endi sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then goto show2 endi -if $data3_2 != slave then +if $data2_2 != slave then goto show2 endi @@ -58,9 +49,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -81,9 +72,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -97,9 +88,8 @@ endi print ============== step5 system sh/exec_up.sh -n dnode2 -s stop -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.3 sleep 5000 system sh/exec_up.sh -n dnode2 -s start sql create dnode 192.168.0.2 @@ -109,9 +99,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 diff --git a/tests/script/unique/mnode/mgmt33.sim b/tests/script/unique/mnode/mgmt33.sim index b2235ca6dc..de28dc41a2 100644 --- a/tests/script/unique/mnode/mgmt33.sim +++ b/tests/script/unique/mnode/mgmt33.sim @@ -1,30 +1,21 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 - print ============== step1 system sh/exec_up.sh -n dnode1 -s start sql connect sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -print 192.168.0.3 ==> $data3_3 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +print dnode3 ==> $data3_3 +if $data2_1 != master then return -1 endi if $data3_2 != null then @@ -43,9 +34,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -66,9 +57,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -88,9 +79,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -105,9 +96,8 @@ endi system sh/exec_up.sh -n dnode2 -s stop sleep 3000 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.3 system sh/exec_up.sh -n dnode2 -s start print ============== step5 @@ -118,9 +108,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_4 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -140,9 +130,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_4 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != offline then return -1 @@ -162,9 +152,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != null then return -1 diff --git a/tests/script/unique/mnode/mgmt34.sim b/tests/script/unique/mnode/mgmt34.sim index 1c12b2ee39..2ba090fe9e 100644 --- a/tests/script/unique/mnode/mgmt34.sim +++ b/tests/script/unique/mnode/mgmt34.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 @@ -21,10 +21,10 @@ sleep 3000 sql connect sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -print 192.168.0.3 ==> $data3_3 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +print dnode3 ==> $data3_3 +if $data2_1 != master then return -1 endi if $data3_2 != null then @@ -44,10 +44,10 @@ $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 $dnode4Role = $data3_4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 @@ -72,10 +72,10 @@ $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 $dnode4Role = $data3_4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 @@ -101,10 +101,10 @@ $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 $dnode4Role = $data3_4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 @@ -128,10 +128,10 @@ $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 $dnode4Role = $data3_4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 @@ -149,9 +149,8 @@ endi system sh/exec_up.sh -n dnode2 -s stop sleep 3000 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.3 system sh/exec_up.sh -n dnode2 -s start print ============== step6 @@ -163,10 +162,10 @@ $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 $dnode4Role = $data3_4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 @@ -190,10 +189,10 @@ $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 $dnode4Role = $data3_4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != offline then return -1 @@ -208,10 +207,10 @@ $dnode1Role = $data3_1 $dnode2Role = $data3_5 $dnode3Role = $data3_3 $dnode4Role = $data3_4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != null then return -1 diff --git a/tests/script/unique/mnode/mgmtr2.sim b/tests/script/unique/mnode/mgmtr2.sim index 666b8a7b33..60907c90ba 100644 --- a/tests/script/unique/mnode/mgmtr2.sim +++ b/tests/script/unique/mnode/mgmtr2.sim @@ -1,21 +1,12 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.3 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.3 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.3 - print ============== step1 system sh/exec_up.sh -n dnode1 -s start sql connect @@ -25,9 +16,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -70,9 +61,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 diff --git a/tests/script/unique/mnode/secondIp.sim b/tests/script/unique/mnode/secondIp.sim index 6902c7d498..ae339c3d21 100644 --- a/tests/script/unique/mnode/secondIp.sim +++ b/tests/script/unique/mnode/secondIp.sim @@ -1,10 +1,6 @@ system sh/stop_dnodes.sh - -system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.2 -i 192.168.0.2 - -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.1 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 print ========== step1 dnode2 start system sh/exec_up.sh -n dnode2 -s start @@ -17,10 +13,10 @@ sleep 3000 print ========== step3 sql show dnodes -print 192.168.0.1 openvnodes $data3_1 -print 192.168.0.2 openvnodes $data3_2 -print 192.168.0.1 totalvnodes $data4_1 -print 192.168.0.2 totalvnodes $data4_2 +print dnode1 openvnodes $data3_1 +print dnode2 openvnodes $data3_2 +print dnode1 totalvnodes $data4_1 +print dnode2 totalvnodes $data4_2 if $rows != 2 then return -1 diff --git a/tests/script/unique/stream/metrics_balance.sim b/tests/script/unique/stream/metrics_balance.sim index 9efb32060c..86137f8d13 100644 --- a/tests/script/unique/stream/metrics_balance.sim +++ b/tests/script/unique/stream/metrics_balance.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c statusInterval -v 1 @@ -189,9 +189,9 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 0 then goto show1 @@ -214,9 +214,9 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show2 diff --git a/tests/script/unique/stream/metrics_replica1_dnode2.sim b/tests/script/unique/stream/metrics_replica1_dnode2.sim index e55ffbefd7..c2a3c813c3 100644 --- a/tests/script/unique/stream/metrics_replica1_dnode2.sim +++ b/tests/script/unique/stream/metrics_replica1_dnode2.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 diff --git a/tests/script/unique/stream/metrics_replica2_dnode2.sim b/tests/script/unique/stream/metrics_replica2_dnode2.sim index a3bcd45048..d5631be8d4 100644 --- a/tests/script/unique/stream/metrics_replica2_dnode2.sim +++ b/tests/script/unique/stream/metrics_replica2_dnode2.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim b/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim index 3731df7f27..6e3baf424c 100644 --- a/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim +++ b/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 diff --git a/tests/script/unique/stream/metrics_replica2_dnode3.sim b/tests/script/unique/stream/metrics_replica2_dnode3.sim index 092232b061..a5756e711c 100644 --- a/tests/script/unique/stream/metrics_replica2_dnode3.sim +++ b/tests/script/unique/stream/metrics_replica2_dnode3.sim @@ -1,11 +1,11 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/stream/metrics_replica3_dnode4.sim b/tests/script/unique/stream/metrics_replica3_dnode4.sim index 900e26f8da..7451347186 100644 --- a/tests/script/unique/stream/metrics_replica3_dnode4.sim +++ b/tests/script/unique/stream/metrics_replica3_dnode4.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/stream/metrics_vnode_stop.sim b/tests/script/unique/stream/metrics_vnode_stop.sim index 47eff851d7..20236276ea 100644 --- a/tests/script/unique/stream/metrics_vnode_stop.sim +++ b/tests/script/unique/stream/metrics_vnode_stop.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2 @@ -97,8 +97,8 @@ print ============= step6 sql close system sh/exec.sh -n dnode1 -s stop system sh/exec.sh -n dnode2 -s stop -system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.2 -i 192.168.0.2 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/exec.sh -n dnode2 -s start diff --git a/tests/script/unique/stream/table_balance.sim b/tests/script/unique/stream/table_balance.sim index 4b77f25189..9bf9b9ed47 100644 --- a/tests/script/unique/stream/table_balance.sim +++ b/tests/script/unique/stream/table_balance.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c statusInterval -v 1 @@ -124,9 +124,9 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 0 then goto show1 @@ -149,9 +149,9 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show2 diff --git a/tests/script/unique/stream/table_move.sim b/tests/script/unique/stream/table_move.sim index 3a4c1c976f..fd03426dd5 100644 --- a/tests/script/unique/stream/table_move.sim +++ b/tests/script/unique/stream/table_move.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 8 @@ -161,9 +161,9 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 6 then goto show1 @@ -186,9 +186,9 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 7 then goto show2 @@ -215,9 +215,9 @@ show6: endi sql show dnodes -x show6 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != null then goto show6 diff --git a/tests/script/unique/stream/table_replica1_dnode2.sim b/tests/script/unique/stream/table_replica1_dnode2.sim index 5165732535..f087b815fe 100644 --- a/tests/script/unique/stream/table_replica1_dnode2.sim +++ b/tests/script/unique/stream/table_replica1_dnode2.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 diff --git a/tests/script/unique/stream/table_replica2_dnode2.sim b/tests/script/unique/stream/table_replica2_dnode2.sim index 177d2ec344..d35039f617 100644 --- a/tests/script/unique/stream/table_replica2_dnode2.sim +++ b/tests/script/unique/stream/table_replica2_dnode2.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim b/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim index ace39d0604..581a4ab06b 100644 --- a/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim +++ b/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 diff --git a/tests/script/unique/stream/table_replica2_dnode3.sim b/tests/script/unique/stream/table_replica2_dnode3.sim index 658a3dd00c..302b006b21 100644 --- a/tests/script/unique/stream/table_replica2_dnode3.sim +++ b/tests/script/unique/stream/table_replica2_dnode3.sim @@ -1,11 +1,11 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/stream/table_replica3_dnode4.sim b/tests/script/unique/stream/table_replica3_dnode4.sim index 60cab2574e..5fbd27ad42 100644 --- a/tests/script/unique/stream/table_replica3_dnode4.sim +++ b/tests/script/unique/stream/table_replica3_dnode4.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/stream/table_vnode_stop.sim b/tests/script/unique/stream/table_vnode_stop.sim index c4548dda59..05ad2d6a5f 100644 --- a/tests/script/unique/stream/table_vnode_stop.sim +++ b/tests/script/unique/stream/table_vnode_stop.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2 @@ -98,8 +98,8 @@ print ============= step6 sql close system sh/exec.sh -n dnode1 -s stop system sh/exec.sh -n dnode2 -s stop -system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.2 -i 192.168.0.2 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 sleep 2000 diff --git a/tests/script/unique/table/delete_part.sim b/tests/script/unique/table/delete_part.sim index dae57366d0..189bd6c431 100644 --- a/tests/script/unique/table/delete_part.sim +++ b/tests/script/unique/table/delete_part.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/backup/replica4.sim b/tests/script/unique/vnode/backup/replica4.sim index c6eeeca58f..5334b21d53 100644 --- a/tests/script/unique/vnode/backup/replica4.sim +++ b/tests/script/unique/vnode/backup/replica4.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/backup/replica5.sim b/tests/script/unique/vnode/backup/replica5.sim index 3a4f28bdc2..e2e45c0e25 100644 --- a/tests/script/unique/vnode/backup/replica5.sim +++ b/tests/script/unique/vnode/backup/replica5.sim @@ -1,16 +1,16 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 + + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 +system sh/deploy.sh -n dnode5 -i 5 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/commit.sim b/tests/script/unique/vnode/commit.sim index 572f4e08ec..67f6f027b8 100644 --- a/tests/script/unique/vnode/commit.sim +++ b/tests/script/unique/vnode/commit.sim @@ -1,8 +1,8 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numofMpeers -v 3 diff --git a/tests/script/unique/vnode/many.sim b/tests/script/unique/vnode/many.sim index b5b87fc108..ca1475190c 100644 --- a/tests/script/unique/vnode/many.sim +++ b/tests/script/unique/vnode/many.sim @@ -1,12 +1,12 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/replica2_basic.sim b/tests/script/unique/vnode/replica2_basic.sim index 647d692e8e..2926873750 100644 --- a/tests/script/unique/vnode/replica2_basic.sim +++ b/tests/script/unique/vnode/replica2_basic.sim @@ -1,8 +1,8 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numofMpeers -v 3 @@ -120,7 +120,7 @@ endi print =================== step 8 system sh/ip.sh -i 1 -s down -system sh/ip.sh -i 2 -s up + sleep 2000 $y = $x + $N $expect = $N * 6 @@ -137,7 +137,7 @@ if $rows != $expect then endi print =================== step 9 -system sh/ip.sh -i 2 -s up + sleep 2000 $y = $x + $N $expect = $N * 7 @@ -155,7 +155,7 @@ endi print =================== step 10 system sh/ip.sh -i 2 -s down -system sh/ip.sh -i 1 -s up + sleep 2000 $y = $x + $N $expect = $N * 8 @@ -172,7 +172,7 @@ if $rows != $expect then endi print =================== step 11 -system sh/ip.sh -i 2 -s up + sleep 2000 $y = $x + $N $expect = $N * 9 diff --git a/tests/script/unique/vnode/replica2_basic2.sim b/tests/script/unique/vnode/replica2_basic2.sim index 9eb6b4a6ac..0380dfa588 100644 --- a/tests/script/unique/vnode/replica2_basic2.sim +++ b/tests/script/unique/vnode/replica2_basic2.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/replica2_repeat.sim b/tests/script/unique/vnode/replica2_repeat.sim index 9d7caacb59..d8d5c4089e 100644 --- a/tests/script/unique/vnode/replica2_repeat.sim +++ b/tests/script/unique/vnode/replica2_repeat.sim @@ -1,12 +1,12 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/replica3_basic.sim b/tests/script/unique/vnode/replica3_basic.sim index b401e5fc4b..858c570fc4 100644 --- a/tests/script/unique/vnode/replica3_basic.sim +++ b/tests/script/unique/vnode/replica3_basic.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/replica3_repeat.sim b/tests/script/unique/vnode/replica3_repeat.sim index 299036dace..afdcda0dcf 100644 --- a/tests/script/unique/vnode/replica3_repeat.sim +++ b/tests/script/unique/vnode/replica3_repeat.sim @@ -1,12 +1,12 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/replica3_vgroup.sim b/tests/script/unique/vnode/replica3_vgroup.sim index a88c6854be..50fa40629d 100644 --- a/tests/script/unique/vnode/replica3_vgroup.sim +++ b/tests/script/unique/vnode/replica3_vgroup.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/test-all.sh b/tests/test-all.sh index 907ef4bedd..ee1904ba7c 100755 --- a/tests/test-all.sh +++ b/tests/test-all.sh @@ -27,9 +27,9 @@ fi cd ../pytest if [ "$1" == "cron" ]; then - ./fulltest.sh 2>&1 | tee pytest-out.txt + ./fulltest.sh > /dev/null | tee pytest-out.txt else - ./smoketest.sh 2>&1 | tee pytest-out.txt + ./smoketest.sh > /dev/null | tee pytest-out.txt fi totalPySuccess=`grep 'successfully executed' pytest-out.txt | wc -l` @@ -40,7 +40,6 @@ fi totalPyFailed=`grep 'failed\|fault' pytest-out.txt | wc -l` if [ "$totalPyFailed" -ne "0" ]; then - cat pytest-out.txt echo -e "${RED} ### Total $totalPyFailed python case(s) failed! ### ${NC}" exit $totalPyFailed fi diff --git a/tests/test/c/importOneRow.c b/tests/test/c/importOneRow.c index babfdae277..902cf46c3a 100644 --- a/tests/test/c/importOneRow.c +++ b/tests/test/c/importOneRow.c @@ -104,7 +104,12 @@ void taos_error(TAOS *con) { void* taos_execute(void *param) { ThreadObj *pThread = (ThreadObj *)param; - void *taos = taos_connect(tsMasterIp, tsDefaultUser, tsDefaultPass, NULL, 0); + char fqdn[TSDB_FQDN_LEN]; + uint16_t port; + + taosGetFqdnPortFromEp(tsFirst, fqdn, &port); + + void *taos = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port); if (taos == NULL) taos_error(taos); char sql[1024] = {0}; diff --git a/tests/test/c/importPerTabe.c b/tests/test/c/importPerTabe.c index 8a3ff048d3..15b3fc2572 100644 --- a/tests/test/c/importPerTabe.c +++ b/tests/test/c/importPerTabe.c @@ -68,7 +68,12 @@ void createDbAndTable() { int64_t st, et; char qstr[64000]; - con = taos_connect(tsMasterIp, tsDefaultUser, tsDefaultPass, NULL, 0); + char fqdn[TSDB_FQDN_LEN]; + uint16_t port; + + taosGetFqdnPortFromEp(tsFirst, fqdn, &port); + + con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port); if (con == NULL) { pError("failed to connect to DB, reason:%s", taos_errstr(con)); exit(1); @@ -190,8 +195,12 @@ void *syncTest(void *param) { int maxBytes = 60000; pPrint("thread:%d, start to run", pInfo->threadIndex); + char fqdn[TSDB_FQDN_LEN]; + uint16_t port; - con = taos_connect(tsMasterIp, tsDefaultUser, tsDefaultPass, NULL, 0); + taosGetFqdnPortFromEp(tsFirst, fqdn, &port); + + con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port); if (con == NULL) { pError("index:%d, failed to connect to DB, reason:%s", pInfo->threadIndex, taos_errstr(con)); exit(1); diff --git a/tests/test/c/insertPerRow.c b/tests/test/c/insertPerRow.c index de611eeec1..6b5a678093 100644 --- a/tests/test/c/insertPerRow.c +++ b/tests/test/c/insertPerRow.c @@ -68,7 +68,10 @@ void createDbAndTable() { int64_t st, et; char qstr[64000]; - con = taos_connect(tsMasterIp, tsDefaultUser, tsDefaultPass, NULL, 0); + char fqdn[TSDB_FQDN_LEN]; + uint16_t port; + taosGetFqdnPortFromEp(tsFirst, fqdn, &port); + con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port); if (con == NULL) { pError("failed to connect to DB, reason:%s", taos_errstr(con)); exit(1); @@ -191,7 +194,11 @@ void *syncTest(void *param) { pPrint("thread:%d, start to run", pInfo->threadIndex); - con = taos_connect(tsMasterIp, tsDefaultUser, tsDefaultPass, NULL, 0); + char fqdn[TSDB_FQDN_LEN]; + uint16_t port; + + taosGetFqdnPortFromEp(tsFirst, fqdn, &port); + con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port); if (con == NULL) { pError("index:%d, failed to connect to DB, reason:%s", pInfo->threadIndex, taos_errstr(con)); exit(1); diff --git a/tests/test/c/insertPerTable.c b/tests/test/c/insertPerTable.c index 0edae323fa..a439abec88 100644 --- a/tests/test/c/insertPerTable.c +++ b/tests/test/c/insertPerTable.c @@ -68,7 +68,12 @@ void createDbAndTable() { int64_t st, et; char qstr[64000]; - con = taos_connect(tsMasterIp, tsDefaultUser, tsDefaultPass, NULL, 0); + char fqdn[TSDB_FQDN_LEN]; + uint16_t port; + + taosGetFqdnPortFromEp(tsFirst, fqdn, &port); + + con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port); if (con == NULL) { pError("failed to connect to DB, reason:%s", taos_errstr(con)); exit(1); @@ -191,7 +196,12 @@ void *syncTest(void *param) { pPrint("thread:%d, start to run", pInfo->threadIndex); - con = taos_connect(tsMasterIp, tsDefaultUser, tsDefaultPass, NULL, 0); + char fqdn[TSDB_FQDN_LEN]; + uint16_t port; + + taosGetFqdnPortFromEp(tsFirst, fqdn, &port); + + con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port); if (con == NULL) { pError("index:%d, failed to connect to DB, reason:%s", pInfo->threadIndex, taos_errstr(con)); exit(1); diff --git a/tests/tsim/inc/sim.h b/tests/tsim/inc/sim.h index 304c488947..ae8848e1ac 100644 --- a/tests/tsim/inc/sim.h +++ b/tests/tsim/inc/sim.h @@ -160,7 +160,7 @@ extern SCommand simCmdList[]; extern int simScriptPos; extern int simScriptSucced; extern int simDebugFlag; -extern char scriptDir[]; +extern char tsScriptDir[]; extern bool simAsyncQuery; SScript *simParseScript(char *fileName); diff --git a/tests/tsim/src/simExe.c b/tests/tsim/src/simExe.c index 23f8f9173f..b407289c3a 100644 --- a/tests/tsim/src/simExe.c +++ b/tests/tsim/src/simExe.c @@ -24,7 +24,7 @@ void simLogSql(char *sql) { static FILE *fp = NULL; char filename[256]; - sprintf(filename, "%s/sim.sql", scriptDir); + sprintf(filename, "%s/sim.sql", tsScriptDir); if (fp == NULL) { fp = fopen(filename, "w"); if (fp == NULL) { @@ -36,7 +36,12 @@ void simLogSql(char *sql) { fflush(fp); } +char *simParseHostName(char *varName); char *simGetVariable(SScript *script, char *varName, int varLen) { + if (strncmp(varName, "hostname", 8) == 0) { + return simParseHostName(varName); + } + if (strncmp(varName, "error", varLen) == 0) return script->error; if (strncmp(varName, "rows", varLen) == 0) return script->rows; @@ -270,7 +275,7 @@ bool simExecuteRunBackCmd(SScript *script, char *option) { bool simExecuteSystemCmd(SScript *script, char *option) { char buf[4096] = {0}; - sprintf(buf, "cd %s; ", scriptDir); + sprintf(buf, "cd %s; ", tsScriptDir); simVisuallizeOption(script, option, buf + strlen(buf)); int code = system(buf); @@ -306,9 +311,9 @@ void simStoreSystemContentResult(SScript *script, char *filename) { bool simExecuteSystemContentCmd(SScript *script, char *option) { char buf[4096] = {0}; char filename[400] = {0}; - sprintf(filename, "%s/%s.tmp", scriptDir, script->fileName); + sprintf(filename, "%s/%s.tmp", tsScriptDir, script->fileName); - sprintf(buf, "cd %s; ", scriptDir); + sprintf(buf, "cd %s; ", tsScriptDir); simVisuallizeOption(script, option, buf + strlen(buf)); sprintf(buf, "%s > %s 2>/dev/null", buf, filename); diff --git a/tests/tsim/src/simParse.c b/tests/tsim/src/simParse.c index 62f5c1efb8..fddda679c6 100644 --- a/tests/tsim/src/simParse.c +++ b/tests/tsim/src/simParse.c @@ -186,7 +186,7 @@ SScript *simParseScript(char *fileName) { if ((fileName[0] == '.') || (fileName[0] == '/')) { strcpy(name, fileName); } else { - sprintf(name, "%s/%s", scriptDir, fileName); + sprintf(name, "%s/%s", tsScriptDir, fileName); } if ((fd = fopen(name, "r")) == NULL) { diff --git a/tests/tsim/src/simSystem.c b/tests/tsim/src/simSystem.c index 55f1c97d3e..bac68c22d3 100644 --- a/tests/tsim/src/simSystem.c +++ b/tests/tsim/src/simSystem.c @@ -19,6 +19,7 @@ #include "tglobal.h" #include "ttimer.h" #include "tutil.h" +#include "tsocket.h" SScript *simScriptList[MAX_MAIN_SCRIPT_NUM]; SCommand simCmdList[SIM_CMD_END]; @@ -26,8 +27,50 @@ int simScriptPos = -1; int simScriptSucced = 0; int simDebugFlag = 135; void simCloseTaosdConnect(SScript *script); +char simHostName[128]; + +char *simParseHostName(char *varName) { + static char hostName[140]; + + int index = atoi(varName + 8); + int port = 7100; + switch (index) { + case 1: + port = 7100; + break; + case 2: + port = 7200; + break; + case 3: + port = 7300; + break; + case 4: + port = 7400; + break; + case 5: + port = 7500; + break; + case 6: + port = 7600; + break; + case 7: + port = 7700; + break; + case 8: + port = 7800; + break; + case 9: + port = 7900; + break; + } + + sprintf(hostName, "'%s:%d'", simHostName, port); + //simPrint("hostName:%s", hostName); + return hostName; +} bool simSystemInit() { + taosGetFqdn(simHostName); taos_init(); simInitsimCmdList(); memset(simScriptList, 0, sizeof(SScript *) * MAX_MAIN_SCRIPT_NUM);