diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7eba0cd7369705ad7d424c0b0026751cee7de23c..729a47b3066362ac6034ac3ec902483fd201fa8f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -15,5 +15,5 @@ ADD_SUBDIRECTORY(plugins) ADD_SUBDIRECTORY(sdb) ADD_SUBDIRECTORY(mnode) # ADD_SUBDIRECTORY(vnode) -# ADD_SUBDIRECTORY(dnode) +ADD_SUBDIRECTORY(dnode) #ADD_SUBDIRECTORY(connector/jdbc) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 5c5366c53f825f6b302abc2579bc6e31dd3d1e29..6a5415a066c1e01bf29b411e55c4523cc5c2ed45 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -1,9 +1,11 @@ -aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/src SOURCE_LIST) +CMAKE_MINIMUM_REQUIRED(VERSION 2.8) +PROJECT(TDengine) -add_library(common ${SOURCE_LIST}) -target_include_directories( - common - PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/inc - PUBLIC ${CMAKE_SOURCE_DIR}/src/inc - PUBLIC ${CMAKE_SOURCE_DIR}/src/os/linux/inc - ) \ No newline at end of file +IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) + INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc) + INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc) + INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc) + INCLUDE_DIRECTORIES(inc) + AUX_SOURCE_DIRECTORY(src SRC) + ADD_LIBRARY(common ${SRC}) +ENDIF () diff --git a/src/inc/mnode.h b/src/inc/mnode.h index 04ff2ff5053de4b5013e787788e6a255b76cf981..15f1e653c51e2d119e576ac0505d18ad7d98290e 100644 --- a/src/inc/mnode.h +++ b/src/inc/mnode.h @@ -47,8 +47,6 @@ extern void *tsMgmtTmr; extern void *tsMgmtTranQhandle; extern char tsMgmtDirectory[]; -extern int tsDbUpdateSize; - typedef struct { uint32_t privateIp; int32_t sid; diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h index 6b7b6a672c483b3af5da4e60c4b3e68d837ea7df..a2efd917df8575fe1afa02709ff6f1271a468b89 100644 --- a/src/inc/taosmsg.h +++ b/src/inc/taosmsg.h @@ -59,6 +59,9 @@ extern "C" { #define TSDB_MSG_TYPE_MD_CONFIG_DNODE_RSP 26 +#define TSDB_MSG_TYPE_CM_CONFIG_DNODE TSDB_MSG_TYPE_MD_CONFIG_DNODE +#define TSDB_MSG_TYPE_CM_CONFIG_DNODE_RSP TSDB_MSG_TYPE_MD_CONFIG_DNODE_RSP + #define TSDB_MSG_TYPE_DM_CONFIG_VNODE 19 #define TSDB_MSG_TYPE_DM_CONFIG_VNODE_RSP 20 diff --git a/src/mnode/inc/mgmtBalance.h b/src/mnode/inc/mgmtBalance.h index 7a6bb3a9aa3d8d66d636dc069d575a9739e28e8c..ad55e0645c41f8f166637aca86fd0df14e174a4d 100644 --- a/src/mnode/inc/mgmtBalance.h +++ b/src/mnode/inc/mgmtBalance.h @@ -19,13 +19,11 @@ #ifdef __cplusplus extern "C" { #endif - #include "mnode.h" int32_t mgmtInitBalance(); void mgmtCleanupBalance(); int32_t mgmtAllocVnodes(SVgObj *pVgroup); -char* mgmtGetVnodeStatus(SVgObj *pVgroup, SVnodeGid *pVnode); #ifdef __cplusplus } diff --git a/src/mnode/inc/mgmtDClient.h b/src/mnode/inc/mgmtDClient.h index ad86aa91e46355634b313474feb7557fc134a586..1bd222f4bce3b1512093cdc2efb6a9a703619bfd 100644 --- a/src/mnode/inc/mgmtDClient.h +++ b/src/mnode/inc/mgmtDClient.h @@ -23,6 +23,7 @@ extern "C" { int32_t mgmtInitDClient(); void mgmtCleanupDClient(); void mgmtAddDClientRspHandle(uint8_t msgType, void (*fp)(SRpcMsg *rpcMsg)); +void mgmtSendMsgToDnode(SRpcIpSet *ipSet, SRpcMsg *rpcMsg); #ifdef __cplusplus } diff --git a/src/mnode/inc/mgmtDServer.h b/src/mnode/inc/mgmtDServer.h index b4cea21b68f0bd01f984d85dea535d287b9acd30..5f2679f266587066beb12c70d698b7a4625c14f2 100644 --- a/src/mnode/inc/mgmtDServer.h +++ b/src/mnode/inc/mgmtDServer.h @@ -30,10 +30,7 @@ void mgmtAddDServerMsgHandle(uint8_t msgType, void (*fp)(SRpcMsg *rpcMsg)); //void mgmtSendCreateTableMsg(SDMCreateTableMsg *pCreate, SRpcIpSet *ipSet, void *ahandle); //void mgmtSendDropTableMsg(SMDDropTableMsg *pRemove, SRpcIpSet *ipSet, void *ahandle); //void mgmtSendAlterStreamMsg(STableInfo *pTable, SRpcIpSet *ipSet, void *ahandle); -//void mgmtSendCreateVnodeMsg(SVgObj *pVgroup, int32_t vnode, SRpcIpSet *ipSet, void *ahandle); -//void mgmtSendCreateVgroupMsg(SVgObj *pVgroup, void *ahandle); //void mgmtSendDropVnodeMsg(int32_t vnode, SRpcIpSet *ipSet, void *ahandle); -//void mgmtSendDropVgroupMsg(SVgObj *pVgroup, void *ahandle); // //int32_t mgmtInitDnodeInt(); //void mgmtCleanUpDnodeInt(); diff --git a/src/mnode/inc/mgmtDb.h b/src/mnode/inc/mgmtDb.h index b59cd6582a5a4e87f6780068af27540193db7e91..32bb9d9ec63f386200f85f00d2c5d92c07b04273 100644 --- a/src/mnode/inc/mgmtDb.h +++ b/src/mnode/inc/mgmtDb.h @@ -22,24 +22,16 @@ extern "C" { #include "mnode.h" -void mgmtMonitorDbDrop(void *unused, void *unusedt); -int32_t mgmtAlterDb(SAcctObj *pAcct, SAlterDbMsg *pAlter); int32_t mgmtAddVgroupIntoDb(SDbObj *pDb, SVgObj *pVgroup); int32_t mgmtAddVgroupIntoDbTail(SDbObj *pDb, SVgObj *pVgroup); int32_t mgmtRemoveVgroupFromDb(SDbObj *pDb, SVgObj *pVgroup); int32_t mgmtMoveVgroupToTail(SDbObj *pDb, SVgObj *pVgroup); int32_t mgmtMoveVgroupToHead(SDbObj *pDb, SVgObj *pVgroup); -int32_t mgmtGetDbMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn); -int32_t mgmtRetrieveDbs(SShowObj *pShow, char *data, int32_t rows, void *pConn); -void mgmtCleanUpDbs(); int32_t mgmtInitDbs(); -int32_t mgmtUpdateDb(SDbObj *pDb); +void mgmtCleanUpDbs(); SDbObj *mgmtGetDb(char *db); SDbObj *mgmtGetDbByTableId(char *db); -int32_t mgmtCreateDb(SAcctObj *pAcct, SCreateDbMsg *pCreate); -int32_t mgmtDropDbByName(SAcctObj *pAcct, char *name, short ignoreNotExists); -int32_t mgmtDropDb(SDbObj *pDb); bool mgmtCheckIsMonitorDB(char *db, char *monitordb); void mgmtAddSuperTableIntoDb(SDbObj *pDb); diff --git a/src/mnode/inc/mgmtDnode.h b/src/mnode/inc/mgmtDnode.h index 6532c98612c682e79f2ebad2e68a8d4f843f2cc5..2fd6cb3d8d395f527d77acb786b6807eb955f085 100644 --- a/src/mnode/inc/mgmtDnode.h +++ b/src/mnode/inc/mgmtDnode.h @@ -19,46 +19,22 @@ #ifdef __cplusplus extern "C" { #endif - -#include -#include #include "mnode.h" -void mgmtSetDnodeVgid(SVnodeGid vnodeGid[], int32_t numOfVnodes, int32_t vgId); -void mgmtUnSetDnodeVgid(SVnodeGid vnodeGid[], int32_t numOfVnodes); -int32_t mgmtGetDnodeMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn); -int32_t mgmtRetrieveDnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn); -int32_t mgmtSendCfgDnodeMsg(char *cont); -void mgmtSetDnodeMaxVnodes(SDnodeObj *pDnode); - -int32_t mgmtGetConfigMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn); -int32_t mgmtRetrieveConfigs(SShowObj *pShow, char *data, int32_t rows, void *pConn); - -bool mgmtCheckModuleInDnode(SDnodeObj *pDnode, int32_t moduleType); -int32_t mgmtGetModuleMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn); -int32_t mgmtRetrieveModules(SShowObj *pShow, char *data, int32_t rows, void *pConn); - -int32_t mgmtGetVnodeMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn); -int32_t mgmtRetrieveVnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn); - -int32_t mgmtGetScoresMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn); -int32_t mgmtRetrieveScores(SShowObj *pShow, char *data, int32_t rows, void *pConn); - int32_t mgmtInitDnodes(); void mgmtCleanUpDnodes(); int32_t mgmtGetDnodesNum(); int32_t mgmtUpdateDnode(SDnodeObj *pDnode); -void* mgmtGetNextDnode(SShowObj *pShow, SDnodeObj **pDnode); -bool mgmtCheckConfigShow(SGlobalConfig *cfg); -bool mgmtCheckDnodeInRemoveState(SDnodeObj *pDnode); -bool mgmtCheckDnodeInOfflineState(SDnodeObj *pDnode); -void mgmtSetDnodeUnRemove(SDnodeObj *pDnode); SDnodeObj* mgmtGetDnode(uint32_t ip); -extern int32_t (*mgmtCreateDnodeFp)(uint32_t ip); -extern int32_t (*mgmtDropDnodeByIpFp)(uint32_t ip); - +bool mgmtCheckDnodeInRemoveState(SDnodeObj *pDnode); +bool mgmtCheckDnodeInOfflineState(SDnodeObj *pDnode); +bool mgmtCheckModuleInDnode(SDnodeObj *pDnode, int32_t moduleType); +void mgmtSetDnodeUnRemove(SDnodeObj *pDnode); +void mgmtSetDnodeMaxVnodes(SDnodeObj *pDnode); void mgmtCalcNumOfFreeVnodes(SDnodeObj *pDnode); +void mgmtSetDnodeVgid(SVnodeGid vnodeGid[], int32_t numOfVnodes, int32_t vgId); +void mgmtUnSetDnodeVgid(SVnodeGid vnodeGid[], int32_t numOfVnodes); #ifdef __cplusplus } diff --git a/src/mnode/inc/mgmtGrant.h b/src/mnode/inc/mgmtGrant.h index 01a5068bada043992a43b2c1d0ce0e18ac50f437..ef404f1705a11f202c2b7f7353f198aa53a346e2 100644 --- a/src/mnode/inc/mgmtGrant.h +++ b/src/mnode/inc/mgmtGrant.h @@ -19,9 +19,6 @@ #ifdef __cplusplus "C" { #endif - -#include -#include #include "mnode.h" bool mgmtCheckExpired(); @@ -30,11 +27,6 @@ void mgmtRestoreTimeSeries(SAcctObj *pAcct, uint32_t timeseries); int32_t mgmtCheckTimeSeries(uint32_t timeseries); int32_t mgmtCheckUserGrant(); int32_t mgmtCheckDbGrant(); -int32_t mgmtCheckDnodeGrant(); -int32_t mgmtGetGrantsMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn); -int32_t mgmtRetrieveGrants(SShowObj *pShow, char *data, int32_t rows, void *pConn); - -extern void (*mgmtUpdateGrantInfoFp)(void *pCont); #ifdef __cplusplus } diff --git a/src/mnode/inc/mgmtMnode.h b/src/mnode/inc/mgmtMnode.h index 703951f44ba6b5c51ae1da148bf49f53a1958066..27256d805aaef85e0d630249a8c6e17c714bc412 100644 --- a/src/mnode/inc/mgmtMnode.h +++ b/src/mnode/inc/mgmtMnode.h @@ -20,19 +20,8 @@ extern "C" { #endif -#include -#include -#include "mnode.h" - - bool mgmtCheckRedirect(void *handle); -int32_t mgmtAddMnode(uint32_t privateIp, uint32_t publicIp); -int32_t mgmtRemoveMnode(uint32_t privateIp); - -int32_t mgmtGetMnodeMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn); -int32_t mgmtRetrieveMnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn); - #ifdef __cplusplus } #endif diff --git a/src/mnode/inc/mgmtProfile.h b/src/mnode/inc/mgmtProfile.h index 5af38a73b8b67a200b7acfb9e9d7b91f877cf05a..31904666586cd5a1f7c349f07b75d0e90fc48762 100644 --- a/src/mnode/inc/mgmtProfile.h +++ b/src/mnode/inc/mgmtProfile.h @@ -19,27 +19,15 @@ #ifdef __cplusplus extern "C" { #endif - #include "mnode.h" +int32_t mgmtInitProfile(); +void mgmtCleanUpProfile(); + bool mgmtCheckQhandle(uint64_t qhandle); void mgmtSaveQhandle(void *qhandle); void mgmtFreeQhandle(void *qhandle); -int32_t mgmtSaveQueryStreamList(SHeartBeatMsg *pHBMsg); -int32_t mgmtGetQueryMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn); -int32_t mgmtRetrieveQueries(SShowObj *pShow, char *data, int32_t rows, void *pConn); - -int32_t mgmtGetStreamMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn); -int32_t mgmtRetrieveStreams(SShowObj *pShow, char *data, int32_t rows, void *pConn); - -int32_t mgmtGetConnsMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn); -int32_t mgmtRetrieveConns(SShowObj *pShow, char *data, int32_t rows, void *pConn); - -int32_t mgmtKillQuery(char *qidstr, void *pConn); -int32_t mgmtKillStream(char *qidstr, void *pConn); -int32_t mgmtKillConnection(char *qidstr, void *pConn); - enum { TSDB_PROCESS_CREATE_VGROUP, TSDB_PROCESS_CREATE_VGROUP_GET_META, diff --git a/src/mnode/inc/mgmtShell.h b/src/mnode/inc/mgmtShell.h index 5a924ca0674847714977f6dee44d7cf5166532a7..ff089dad7ebb110388002d93eaf9252562a4c1cd 100644 --- a/src/mnode/inc/mgmtShell.h +++ b/src/mnode/inc/mgmtShell.h @@ -30,23 +30,6 @@ typedef int32_t (*SShowRetrieveFp)(SShowObj *pShow, char *data, int32_t rows, vo void mgmtAddShellShowMetaHandle(uint8_t showType, SShowMetaFp fp); void mgmtAddShellShowRetrieveHandle(uint8_t showType, SShowRetrieveFp fp); -//extern int32_t (*mgmtCheckRedirect)(void *pConn); -// -///* -// * If table not exist, will create it -// */ -//void mgmtProcessGetTableMeta(STableInfo *pTable, void *thandle); -// -///* -// * If vgroup not exist, will create vgroup -// */ -//void mgmtProcessCreateTable(SVgObj *pVgroup, SCreateTableMsg *pCreate, int32_t contLen, void *thandle, bool isGetMeta); -// -///* -// * If vgroup create returned, will then create table -// */ -//void mgmtProcessCreateVgroup(SCreateTableMsg *pCreate, int32_t contLen, void *thandle, bool isGetMeta); - #ifdef __cplusplus } #endif diff --git a/src/mnode/inc/mgmtSuperTable.h b/src/mnode/inc/mgmtSuperTable.h index 4709772e84ab69575ea165e2c24d50437486f1f3..609e8d079f90e82be6aa6b6faf1bf7f685d69eae 100644 --- a/src/mnode/inc/mgmtSuperTable.h +++ b/src/mnode/inc/mgmtSuperTable.h @@ -30,8 +30,6 @@ int32_t mgmtInitSuperTables(); void mgmtCleanUpSuperTables(); void * mgmtGetSuperTable(char *tableId); -int32_t mgmtGetShowSuperTableMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn); -int32_t mgmtRetrieveShowSuperTables(SShowObj *pShow, char *data, int32_t rows, void *pConn); int32_t mgmtCreateSuperTable(SDbObj *pDb, SCreateTableMsg *pCreate); int32_t mgmtDropSuperTable(SDbObj *pDb, SSuperTableObj *pTable); diff --git a/src/mnode/inc/mgmtTable.h b/src/mnode/inc/mgmtTable.h index dbd8971e2c69fd36d1514f3c2d6324ad3d06b605..76b956f538c4e2e6e43b496e0cf7f62fa5cbde1c 100644 --- a/src/mnode/inc/mgmtTable.h +++ b/src/mnode/inc/mgmtTable.h @@ -26,7 +26,9 @@ extern "C" { #include "mnode.h" int32_t mgmtInitTables(); +void mgmtCleanUpTables(); STableInfo* mgmtGetTable(char *tableId); + STableInfo* mgmtGetTableByPos(uint32_t dnodeIp, int32_t vnode, int32_t sid); int32_t mgmtGetTableMeta(SDbObj *pDb, STableInfo *pTable, STableMeta *pMeta, bool usePublicIp); @@ -34,9 +36,6 @@ int32_t mgmtRetrieveMetricMeta(void *pConn, char **pStart, SSuperTableMetaMsg * int32_t mgmtCreateTable(SCreateTableMsg *pCreate, int32_t contLen, void *thandle, bool isGetMeta); int32_t mgmtDropTable(SDbObj *pDb, char *tableId, int32_t ignore); int32_t mgmtAlterTable(SDbObj *pDb, SAlterTableMsg *pAlter); -int32_t mgmtGetShowTableMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn); -int32_t mgmtRetrieveShowTables(SShowObj *pShow, char *data, int32_t rows, void *pConn); -void mgmtCleanUpMeters(); void mgmtAddTableIntoSuperTable(SSuperTableObj *pStable); void mgmtRemoveTableFromSuperTable(SSuperTableObj *pStable); @@ -45,6 +44,9 @@ void mgmtSetTableDirty(STableInfo *pTable, bool isDirty); SMDDropTableMsg *mgmtBuildRemoveTableMsg(STableInfo *pTable); SDRemoveSuperTableMsg *mgmtBuildRemoveSuperTableMsg(STableInfo *pTable); +void mgmtProcessGetTableMeta(STableInfo *pTable, void *thandle); +void mgmtProcessCreateTable(SVgObj *pVgroup, SCreateTableMsg *pCreate, int32_t contLen, void *thandle, bool isGetMeta); +void mgmtProcessCreateVgroup(SCreateTableMsg *pCreate, int32_t contLen, void *thandle, bool isGetMeta); #ifdef __cplusplus } diff --git a/src/mnode/inc/mgmtUser.h b/src/mnode/inc/mgmtUser.h index a1b1d4f56811a500a9088a61271916641909da9a..d1f927f6de629d9d0fb374deff58ff73cf8baa62 100644 --- a/src/mnode/inc/mgmtUser.h +++ b/src/mnode/inc/mgmtUser.h @@ -24,6 +24,7 @@ extern "C" { int32_t mgmtInitUsers(); void mgmtCleanUpUsers(); SUserObj *mgmtGetUser(char *name); +SUserObj *mgmtGetUserFromConn(void *pConn); #ifdef __cplusplus } diff --git a/src/mnode/inc/mgmtVgroup.h b/src/mnode/inc/mgmtVgroup.h index 33a1fcad9fcf2a210f29a1ac6e7c495f6771c9cc..975a10dc47ca2303b52ef02c637358370577ea10 100644 --- a/src/mnode/inc/mgmtVgroup.h +++ b/src/mnode/inc/mgmtVgroup.h @@ -33,9 +33,6 @@ SVgObj *mgmtCreateVgroup(SDbObj *pDb); int32_t mgmtDropVgroup(SDbObj *pDb, SVgObj *pVgroup); void mgmtUpdateVgroup(SVgObj *pVgroup); -int32_t mgmtGetVgroupMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn); -int32_t mgmtRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, void *pConn); - void mgmtSetVgroupIdPool(); SVgObj *mgmtGetAvailableVgroup(SDbObj *pDb); @@ -43,6 +40,8 @@ void mgmtAddTableIntoVgroup(SVgObj *pVgroup, STableInfo *pTable); void mgmtRemoveTableFromVgroup(SVgObj *pVgroup, STableInfo *pTable); SMDCreateVnodeMsg *mgmtBuildCreateVnodeMsg(SVgObj *pVgroup, int32_t vnode); +void mgmtSendCreateVnodeMsg(SVgObj *pVgroup, int32_t vnode, SRpcIpSet *ipSet, void *ahandle); +void mgmtSendCreateVgroupMsg(SVgObj *pVgroup, void *ahandle); SRpcIpSet mgmtGetIpSetFromVgroup(SVgObj *pVgroup); SRpcIpSet mgmtGetIpSetFromIp(uint32_t ip); diff --git a/src/mnode/src/mgmtBalance.c b/src/mnode/src/mgmtBalance.c index 8bd9cf893393255d0259795bcc89c41b50d7d087..81f410548e13e606cea3375434e1635c962824e3 100644 --- a/src/mnode/src/mgmtBalance.c +++ b/src/mnode/src/mgmtBalance.c @@ -14,24 +14,13 @@ */ #define _DEFAULT_SOURCE -#include "tglobalcfg.h" -#include "tmodule.h" #include "tstatus.h" -#include "ttime.h" #include "mgmtBalance.h" #include "mgmtDnode.h" -void (*mgmtStartBalanceTimerFp)(int64_t mseconds) = NULL; int32_t (*mgmtInitBalanceFp)() = NULL; void (*mgmtCleanupBalanceFp)() = NULL; int32_t (*mgmtAllocVnodesFp)(SVgObj *pVgroup) = NULL; -char * (*mgmtGetVnodeStatusFp)(SVgObj *pVgroup, SVnodeGid *pVnode) = NULL; - -void mgmtStartBalanceTimer(int64_t mseconds) { - if (mgmtStartBalanceTimerFp) { - (*mgmtStartBalanceTimerFp)(mseconds); - } -} int32_t mgmtInitBalance() { if (mgmtInitBalanceFp) { @@ -55,11 +44,11 @@ int32_t mgmtAllocVnodes(SVgObj *pVgroup) { SDnodeObj *pDnode = mgmtGetDnode(0); if (pDnode == NULL) return TSDB_CODE_OTHERS; - int selectedVnode = -1; - int lastAllocVode = pDnode->lastAllocVnode; + int32_t selectedVnode = -1; + int32_t lastAllocVode = pDnode->lastAllocVnode; - for (int i = 0; i < pDnode->numOfVnodes; i++) { - int vnode = (i + lastAllocVode) % pDnode->numOfVnodes; + for (int32_t i = 0; i < pDnode->numOfVnodes; i++) { + int32_t vnode = (i + lastAllocVode) % pDnode->numOfVnodes; if (pDnode->vload[vnode].vgId == 0 && pDnode->vload[vnode].status == TSDB_VN_STATUS_OFFLINE) { selectedVnode = vnode; break; diff --git a/src/mnode/src/mgmtChildTable.c b/src/mnode/src/mgmtChildTable.c index a214a44573eb9bc63787699977f81a2d902c456b..d27fa8010227238bfc5899274c54178b1978a91c 100644 --- a/src/mnode/src/mgmtChildTable.c +++ b/src/mnode/src/mgmtChildTable.c @@ -28,6 +28,8 @@ #include "mgmtDb.h" #include "mgmtGrant.h" #include "mgmtProfile.h" +#include "mgmtShell.h" +#include "mgmtDClient.h" #include "mgmtSuperTable.h" #include "mgmtTable.h" #include "mgmtVgroup.h" @@ -387,7 +389,16 @@ int32_t mgmtDropChildTable(SDbObj *pDb, SChildTableObj *pTable) { } SRpcIpSet ipSet = mgmtGetIpSetFromVgroup(pVgroup); - mgmtSendDropTableMsg(pRemove, &ipSet, NULL); + + mTrace("table:%s, send drop table msg", pRemove->tableId); + SRpcMsg rpcMsg = { + .handle = 0, + .pCont = pRemove, + .contLen = sizeof(SMDDropTableMsg), + .code = 0, + .msgType = TSDB_MSG_TYPE_MD_DROP_TABLE + }; + mgmtSendMsgToDnode(&ipSet, &rpcMsg); if (sdbDeleteRow(tsChildTableSdb, pTable) < 0) { mError("table:%s, update ctables sdb error", pTable->tableId); diff --git a/src/mnode/src/mgmtDClient.c b/src/mnode/src/mgmtDClient.c index 0f7cce405db537d8cd595489c540abda25fab3c0..4670663222dde7b01521976e6ba7912f2247c701 100644 --- a/src/mnode/src/mgmtDClient.c +++ b/src/mnode/src/mgmtDClient.c @@ -70,6 +70,10 @@ void mgmtAddDClientRspHandle(uint8_t msgType, void (*fp)(SRpcMsg *rpcMsg)) { mgmtProcessDnodeRspFp[msgType] = fp; } +void mgmtSendMsgToDnode(SRpcIpSet *ipSet, SRpcMsg *rpcMsg) { + rpcSendRequest(tsMgmtDClientRpc, ipSet, rpcMsg); +} + static void mgmtProcessRspFromDnode(SRpcMsg *rpcMsg) { if (mgmtProcessDnodeRspFp[rpcMsg->msgType]) { (*mgmtProcessDnodeRspFp[rpcMsg->msgType])(rpcMsg); @@ -80,17 +84,7 @@ static void mgmtProcessRspFromDnode(SRpcMsg *rpcMsg) { rpcFreeCont(rpcMsg->pCont); } -//static void mgmtProcessCreateTableRsp(SRpcMsg *rpcMsg); -//static void mgmtProcessDropTableRsp(SRpcMsg *rpcMsg); -//static void mgmtProcessAlterTableRsp(SRpcMsg *rpcMsg); -//static void mgmtProcessCreateVnodeRsp(SRpcMsg *rpcMsg); -//static void mgmtProcessDropVnodeRsp(SRpcMsg *rpcMsg); -//static void mgmtProcessAlterVnodeRsp(SRpcMsg *rpcMsg); -//static void mgmtProcessDropStableRsp(SRpcMsg *rpcMsg); -//static void mgmtProcessAlterStreamRsp(SRpcMsg *rpcMsg); -//static void mgmtProcessConfigDnodeRsp(SRpcMsg *rpcMsg); -// //static void mgmtProcessCreateTableRsp(SRpcMsg *rpcMsg) { // mTrace("create table rsp received, handle:%p code:%d", rpcMsg->handle, rpcMsg->code); // if (rpcMsg->handle == NULL) return; @@ -173,50 +167,8 @@ static void mgmtProcessRspFromDnode(SRpcMsg *rpcMsg) { // mTrace("config dnode rsp received, handle:%p code:%d", rpcMsg->handle, rpcMsg->code); //} // -//void mgmtSendCreateTableMsg(SDMCreateTableMsg *pCreate, SRpcIpSet *ipSet, void *ahandle) { -// mTrace("table:%s, send create table msg, ahandle:%p", pCreate->tableId, ahandle); -// SRpcMsg rpcMsg = { -// .handle = ahandle, -// .pCont = pCreate, -// .contLen = htonl(pCreate->contLen), -// .code = 0, -// .msgType = TSDB_MSG_TYPE_MD_CREATE_TABLE -// }; -// rpcSendRequest(tsMgmtDClientRpc, ipSet, &rpcMsg); -//} -// -//void mgmtSendDropTableMsg(SMDDropTableMsg *pDrop, SRpcIpSet *ipSet, void *ahandle) { -// mTrace("table:%s, send drop table msg, ahandle:%p", pDrop->tableId, ahandle); -// SRpcMsg rpcMsg = { -// .handle = ahandle, -// .pCont = pDrop, -// .contLen = sizeof(SMDDropTableMsg), -// .code = 0, -// .msgType = TSDB_MSG_TYPE_MD_DROP_TABLE -// }; -// rpcSendRequest(tsMgmtDClientRpc, ipSet, &rpcMsg); -//} -// -//void mgmtSendCreateVnodeMsg(SVgObj *pVgroup, int32_t vnode, SRpcIpSet *ipSet, void *ahandle) { -// mTrace("vgroup:%d, send create vnode:%d msg, ahandle:%p", pVgroup->vgId, vnode, ahandle); -// SMDCreateVnodeMsg *pCreate = mgmtBuildCreateVnodeMsg(pVgroup, vnode); -// SRpcMsg rpcMsg = { -// .handle = ahandle, -// .pCont = pCreate, -// .contLen = pCreate ? sizeof(SMDCreateVnodeMsg) : 0, -// .code = 0, -// .msgType = TSDB_MSG_TYPE_MD_CREATE_VNODE -// }; -// rpcSendRequest(tsMgmtDClientRpc, ipSet, &rpcMsg); -//} -// -//void mgmtSendCreateVgroupMsg(SVgObj *pVgroup, void *ahandle) { -// mTrace("vgroup:%d, send create all vnodes msg, handle:%p", pVgroup->vgId, ahandle); -// for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) { -// SRpcIpSet ipSet = mgmtGetIpSetFromIp(pVgroup->vnodeGid[i].ip); -// mgmtSendCreateVnodeMsg(pVgroup, pVgroup->vnodeGid[i].vnode, &ipSet, ahandle); -// } -//} + + // //void mgmtSendAlterStreamMsg(STableInfo *pTable, SRpcIpSet *ipSet, void *ahandle) { // mTrace("table:%s, send alter stream msg, ahandle:%p", pTable->tableId, pTable->sid, ahandle); @@ -235,13 +187,7 @@ static void mgmtProcessRspFromDnode(SRpcMsg *rpcMsg) { // rpcSendRequest(tsMgmtDClientRpc, ipSet, &rpcMsg); //} // -//void mgmtSendDropVgroupMsg(SVgObj *pVgroup, void *ahandle) { -// mTrace("vgroup:%d send free vgroup msg, ahandle:%p", pVgroup->vgId, ahandle); -// for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) { -// SRpcIpSet ipSet = mgmtGetIpSetFromIp(pVgroup->vnodeGid[i].ip); -// mgmtSendDropVnodeMsg(pVgroup->vgId, pVgroup->vnodeGid[i].vnode, &ipSet, ahandle); -// } -//} + //// ////int32_t mgmtCfgDynamicOptions(SDnodeObj *pDnode, char *msg) { //// char *option, *value; @@ -278,36 +224,3 @@ static void mgmtProcessRspFromDnode(SRpcMsg *rpcMsg) { //// return -1; ////} //// -////int32_t mgmtSendCfgDnodeMsg(char *cont) { -//// SDnodeObj *pDnode; -//// SCfgDnodeMsg * pCfg = (SCfgDnodeMsg *)cont; -//// uint32_t ip; -//// -//// ip = inet_addr(pCfg->ip); -//// pDnode = mgmtGetDnode(ip); -//// if (pDnode == NULL) { -//// mError("dnode ip:%s not configured", pCfg->ip); -//// return TSDB_CODE_NOT_CONFIGURED; -//// } -//// -//// mTrace("dnode:%s, dynamic option received, content:%s", taosIpStr(pDnode->privateIp), pCfg->config); -//// int32_t code = mgmtCfgDynamicOptions(pDnode, pCfg->config); -//// if (code != -1) { -//// return code; -//// } -//// -////#ifdef CLUSTER -//// pStart = taosBuildReqMsg(pDnode->thandle, TSDB_MSG_TYPE_MD_CONFIG_DNODE); -//// if (pStart == NULL) return TSDB_CODE_NODE_OFFLINE; -//// pMsg = pStart; -//// -//// memcpy(pMsg, cont, sizeof(SCfgDnodeMsg)); -//// pMsg += sizeof(SCfgDnodeMsg); -//// -//// msgLen = pMsg - pStart; -//// mgmtSendMsgToDnode(pDnode, pStart, msgLen); -////#else -//// (void)tsCfgDynamicOptions(pCfg->config); -////#endif -//// return 0; -////} diff --git a/src/mnode/src/mgmtDServer.c b/src/mnode/src/mgmtDServer.c index c55731e52aee69ce4dbac587b7c697b3d834ae30..27cbf230d55e5b5c7d8f4bdb0795a63e84f08278 100644 --- a/src/mnode/src/mgmtDServer.c +++ b/src/mnode/src/mgmtDServer.c @@ -174,21 +174,12 @@ static int mgmtDServerRetrieveAuth(char *user, char *spi, char *encrypt, char *s // free(info); //} // -//void mgmtSendCreateTableMsg(SDMCreateTableMsg *pCreate, SRpcIpSet *ipSet, void *ahandle) { -// mTrace("table:%s, send create table msg, ahandle:%p", pCreate->tableId, ahandle); -// mgmtSendMsgToDnode(ipSet, TSDB_MSG_TYPE_MD_CREATE_TABLE, pCreate, htonl(pCreate->contLen), ahandle); -//} -// + //static void mgmtProcessRemoveTableRsp(int8_t msgType, int8_t *pCont, int32_t contLen, void *thandle, int32_t code) { // mTrace("remove table rsp received, thandle:%p code:%d", thandle, code); //} // -//void mgmtSendDropTableMsg(SMDDropTableMsg *pRemove, SRpcIpSet *ipSet, void *ahandle) { -// mTrace("table:%s, sid:%d send remove table msg, ahandle:%p", pRemove->tableId, htonl(pRemove->sid), ahandle); -// if (pRemove != NULL) { -// mgmtSendMsgToDnode(ipSet, TSDB_MSG_TYPE_MD_DROP_TABLE, pRemove, sizeof(SMDDropTableMsg), ahandle); -// } -//} + // //static void mgmtProcessDropVnodeRsp(int8_t msgType, int8_t *pCont, int32_t contLen, void *thandle, int32_t code) { // mTrace("free vnode rsp received, thandle:%p code:%d", thandle, code); @@ -235,18 +226,6 @@ static int mgmtDServerRetrieveAuth(char *user, char *spi, char *encrypt, char *s // } //} // -//static void mgmtProcessDnodeGrantMsg(void *pCont, void *thandle) { -// if (mgmtUpdateGrantInfoFp) { -// mgmtUpdateGrantInfoFp(pCont); -// mTrace("grant info is updated"); -// } -// -// SRpcMsg rpcMsg = {0}; -// rpcMsg.code = TSDB_CODE_SUCCESS; -// rpcMsg.handle = thandle; -// rpcSendResponse(&rpcMsg); -//} -// //void mgmtProcessMsgFromDnode(char msgType, void *pCont, int32_t contLen, void *pConn, int32_t code) { // if (msgType < 0 || msgType >= TSDB_MSG_TYPE_MAX) { // mError("invalid msg type:%d", msgType); @@ -273,9 +252,7 @@ static int mgmtDServerRetrieveAuth(char *user, char *spi, char *encrypt, char *s // } else if (msgType == TSDB_MSG_TYPE_ALTER_STREAM_RSP) { // } else if (msgType == TSDB_MSG_TYPE_STATUS) { // mgmtProcessDnodeStatus(msgType, pCont, contLen, pConn, code); -// } else if (msgType == TSDB_MSG_TYPE_GRANT) { -// mgmtProcessDnodeGrantMsg(pCont, pConn); -// } else { +// } else { // mError("%s from dnode is not processed", taosMsg[(int8_t)msgType]); // } // @@ -296,15 +273,7 @@ static int mgmtDServerRetrieveAuth(char *user, char *spi, char *encrypt, char *s // } //} // -//void mgmtSendDropVgroupMsg(SVgObj *pVgroup, void *ahandle) { -// mTrace("vgroup:%d send free vgroup msg, ahandle:%p", pVgroup->vgId, ahandle); -// -// for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) { -// SRpcIpSet ipSet = mgmtGetIpSetFromIp(pVgroup->vnodeGid[i].ip); -// mgmtSendDropVnodeMsg(pVgroup->vnodeGid[i].vnode, &ipSet, ahandle); -// } -//} -// + //int32_t mgmtCfgDynamicOptions(SDnodeObj *pDnode, char *msg) { // char *option, *value; // int32_t olen, valen; @@ -340,52 +309,6 @@ static int mgmtDServerRetrieveAuth(char *user, char *spi, char *encrypt, char *s // return -1; //} // -//int32_t mgmtSendCfgDnodeMsg(char *cont) { -////#ifdef CLUSTER -//// char * pMsg, *pStart; -//// int32_t msgLen = 0; -////#endif -//// -//// SDnodeObj *pDnode; -//// SCfgDnodeMsg * pCfg = (SCfgDnodeMsg *)cont; -//// uint32_t ip; -//// -//// ip = inet_addr(pCfg->ip); -//// pDnode = mgmtGetDnode(ip); -//// if (pDnode == NULL) { -//// mError("dnode ip:%s not configured", pCfg->ip); -//// return TSDB_CODE_NOT_CONFIGURED; -//// } -//// -//// mTrace("dnode:%s, dynamic option received, content:%s", taosIpStr(pDnode->privateIp), pCfg->config); -//// int32_t code = mgmtCfgDynamicOptions(pDnode, pCfg->config); -//// if (code != -1) { -//// return code; -//// } -//// -////#ifdef CLUSTER -//// pStart = taosBuildReqMsg(pDnode->thandle, TSDB_MSG_TYPE_MD_CONFIG_DNODE); -//// if (pStart == NULL) return TSDB_CODE_NODE_OFFLINE; -//// pMsg = pStart; -//// -//// memcpy(pMsg, cont, sizeof(SCfgDnodeMsg)); -//// pMsg += sizeof(SCfgDnodeMsg); -//// -//// msgLen = pMsg - pStart; -//// mgmtSendMsgToDnode(pDnode, pStart, msgLen); -////#else -//// (void)tsCfgDynamicOptions(pCfg->config); -////#endif -// return 0; -//} -// -//int32_t mgmtInitDnodeInt() { -// if (mgmtInitDnodeIntFp) { -// return mgmtInitDnodeIntFp(); -// } else { -// return 0; -// } -//} // //void mgmtCleanUpDnodeInt() { // if (mgmtCleanUpDnodeIntFp) { diff --git a/src/mnode/src/mgmtDb.c b/src/mnode/src/mgmtDb.c index efb306d8ccd728c4403f752fb4b8bae758a9c9eb..750aa9a1c11b9626a41f8ae7213c4852a0644f45 100644 --- a/src/mnode/src/mgmtDb.c +++ b/src/mnode/src/mgmtDb.c @@ -18,31 +18,43 @@ #include "taoserror.h" #include "tschemautil.h" #include "tstatus.h" +#include "tutil.h" #include "mnode.h" #include "mgmtAcct.h" #include "mgmtBalance.h" #include "mgmtDb.h" #include "mgmtDnode.h" +#include "mgmtMnode.h" #include "mgmtGrant.h" +#include "mgmtShell.h" #include "mgmtTable.h" #include "mgmtUser.h" #include "mgmtVgroup.h" -extern void *tsVgroupSdb; - -void *tsDbSdb = NULL; -int32_t tsDbUpdateSize; - -void *(*mgmtDbActionFp[SDB_MAX_ACTION_TYPES])(void *row, char *str, int32_t size, int32_t *ssize); -void *mgmtDbActionInsert(void *row, char *str, int32_t size, int32_t *ssize); -void *mgmtDbActionDelete(void *row, char *str, int32_t size, int32_t *ssize); -void *mgmtDbActionUpdate(void *row, char *str, int32_t size, int32_t *ssize); -void *mgmtDbActionEncode(void *row, char *str, int32_t size, int32_t *ssize); -void *mgmtDbActionDecode(void *row, char *str, int32_t size, int32_t *ssize); -void *mgmtDbActionReset(void *row, char *str, int32_t size, int32_t *ssize); -void *mgmtDbActionDestroy(void *row, char *str, int32_t size, int32_t *ssize); - -void mgmtDbActionInit() { +static void *tsDbSdb = NULL; +static int32_t tsDbUpdateSize; + +static int32_t mgmtUpdateDb(SDbObj *pDb); +static int32_t mgmtCreateDb(SAcctObj *pAcct, SCreateDbMsg *pCreate); +static int32_t mgmtDropDbByName(SAcctObj *pAcct, char *name, short ignoreNotExists); +static int32_t mgmtDropDb(SDbObj *pDb); + +static int32_t mgmtGetDbMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn); +static int32_t mgmtRetrieveDbs(SShowObj *pShow, char *data, int32_t rows, void *pConn); +static void mgmtProcessCreateDbMsg(SRpcMsg *rpcMsg); +static void mgmtProcessAlterDbMsg(SRpcMsg *rpcMsg); +static void mgmtProcessDropDbMsg(SRpcMsg *rpcMsg); + +static void *(*mgmtDbActionFp[SDB_MAX_ACTION_TYPES])(void *row, char *str, int32_t size, int32_t *ssize); +static void *mgmtDbActionInsert(void *row, char *str, int32_t size, int32_t *ssize); +static void *mgmtDbActionDelete(void *row, char *str, int32_t size, int32_t *ssize); +static void *mgmtDbActionUpdate(void *row, char *str, int32_t size, int32_t *ssize); +static void *mgmtDbActionEncode(void *row, char *str, int32_t size, int32_t *ssize); +static void *mgmtDbActionDecode(void *row, char *str, int32_t size, int32_t *ssize); +static void *mgmtDbActionReset(void *row, char *str, int32_t size, int32_t *ssize); +static void *mgmtDbActionDestroy(void *row, char *str, int32_t size, int32_t *ssize); + +static void mgmtDbActionInit() { mgmtDbActionFp[SDB_TYPE_INSERT] = mgmtDbActionInsert; mgmtDbActionFp[SDB_TYPE_DELETE] = mgmtDbActionDelete; mgmtDbActionFp[SDB_TYPE_UPDATE] = mgmtDbActionUpdate; @@ -52,7 +64,7 @@ void mgmtDbActionInit() { mgmtDbActionFp[SDB_TYPE_DESTROY] = mgmtDbActionDestroy; } -void *mgmtDbAction(char action, void *row, char *str, int32_t size, int32_t *ssize) { +static void *mgmtDbAction(char action, void *row, char *str, int32_t size, int32_t *ssize) { if (mgmtDbActionFp[(uint8_t)action] != NULL) { return (*(mgmtDbActionFp[(uint8_t)action]))(row, str, size, ssize); } @@ -96,6 +108,12 @@ int32_t mgmtInitDbs() { } } + mgmtAddShellMsgHandle(TSDB_MSG_TYPE_CREATE_DB, mgmtProcessCreateDbMsg); + mgmtAddShellMsgHandle(TSDB_MSG_TYPE_ALTER_DB, mgmtProcessAlterDbMsg); + mgmtAddShellMsgHandle(TSDB_MSG_TYPE_DROP_DB, mgmtProcessDropDbMsg); + mgmtAddShellShowMetaHandle(TSDB_MGMT_TABLE_DB, mgmtGetDbMeta); + mgmtAddShellShowRetrieveHandle(TSDB_MGMT_TABLE_DB, mgmtRetrieveDbs); + mTrace("db data is initialized"); return 0; } @@ -115,7 +133,7 @@ SDbObj *mgmtGetDbByTableId(char *tableId) { return (SDbObj *)sdbGetRow(tsDbSdb, db); } -int32_t mgmtCheckDBParams(SCreateDbMsg *pCreate) { +static int32_t mgmtCheckDBParams(SCreateDbMsg *pCreate) { if (pCreate->commitLog < 0 || pCreate->commitLog > 1) { mError("invalid db option commitLog: %d, only 0 or 1 allowed", pCreate->commitLog); return TSDB_CODE_INVALID_OPTION; @@ -188,7 +206,7 @@ int32_t mgmtCheckDBParams(SCreateDbMsg *pCreate) { return TSDB_CODE_SUCCESS; } -int32_t mgmtCheckDbParams(SCreateDbMsg *pCreate) { +static int32_t mgmtCheckDbParams(SCreateDbMsg *pCreate) { // assign default parameters if (pCreate->maxSessions < 0) pCreate->maxSessions = tsSessionsPerVnode; // if (pCreate->cacheBlockSize < 0) pCreate->cacheBlockSize = tsCacheBlockSize; // @@ -233,7 +251,13 @@ int32_t mgmtCheckDbParams(SCreateDbMsg *pCreate) { return TSDB_CODE_SUCCESS; } -int32_t mgmtCreateDb(SAcctObj *pAcct, SCreateDbMsg *pCreate) { +static int32_t mgmtCreateDb(SAcctObj *pAcct, SCreateDbMsg *pCreate) { + int32_t numOfDbs = sdbGetNumOfRows(tsDbSdb); + if (numOfDbs >= tsMaxDbs) { + mWarn("numOfDbs:%d, exceed tsMaxDbs:%d", numOfDbs, tsMaxDbs); + return TSDB_CODE_TOO_MANY_DATABASES; + } + int32_t code = mgmtCheckDbLimit(pAcct); if (code != 0) { return code; @@ -269,11 +293,11 @@ int32_t mgmtCreateDb(SAcctObj *pAcct, SCreateDbMsg *pCreate) { return code; } -int32_t mgmtUpdateDb(SDbObj *pDb) { +static int32_t mgmtUpdateDb(SDbObj *pDb) { return sdbUpdateRow(tsDbSdb, pDb, tsDbUpdateSize, 1); } -int32_t mgmtSetDbDropping(SDbObj *pDb) { +static int32_t mgmtSetDbDropping(SDbObj *pDb) { if (pDb->dropStatus == TSDB_DB_STATUS_DROP_FROM_SDB) return 0; SVgObj *pVgroup = pDb->pHead; @@ -294,6 +318,16 @@ int32_t mgmtSetDbDropping(SDbObj *pDb) { } } } + + //void mgmtSendDropVgroupMsg(SVgObj *pVgroup, void *ahandle) { + // mTrace("vgroup:%d send free vgroup msg, ahandle:%p", pVgroup->vgId, ahandle); + // + // for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) { + // SRpcIpSet ipSet = mgmtGetIpSetFromIp(pVgroup->vnodeGid[i].ip); + // mgmtSendDropVnodeMsg(pVgroup->vnodeGid[i].vnode, &ipSet, ahandle); + // } + //} + // // mgmtSendDropVgroupMsg(pVgroup); pVgroup = pVgroup->next; } @@ -310,7 +344,7 @@ int32_t mgmtSetDbDropping(SDbObj *pDb) { return 0; } -bool mgmtCheckDropDbFinished(SDbObj *pDb) { +static bool mgmtCheckDropDbFinished(SDbObj *pDb) { SVgObj *pVgroup = pDb->pHead; while (pVgroup) { for (int32_t i = 0; i < pVgroup->numOfVnodes; i++) { @@ -333,7 +367,7 @@ bool mgmtCheckDropDbFinished(SDbObj *pDb) { return true; } -void mgmtDropDbFromSdb(SDbObj *pDb) { +static void mgmtDropDbFromSdb(SDbObj *pDb) { while (pDb->pHead) mgmtDropVgroup(pDb, pDb->pHead); // SSuperTableObj *pMetric = pDb->pSTable; @@ -348,13 +382,13 @@ void mgmtDropDbFromSdb(SDbObj *pDb) { mPrint("db:%s database drop finished", pDb->name); } -int32_t mgmtDropDb(SDbObj *pDb) { +static int32_t mgmtDropDb(SDbObj *pDb) { if (pDb->dropStatus == TSDB_DB_STATUS_DROPPING) { bool finished = mgmtCheckDropDbFinished(pDb); if (!finished) { SVgObj *pVgroup = pDb->pHead; while (pVgroup != NULL) { - mgmtSendDropVgroupMsg(pVgroup, NULL); + //mgmtSendDropVgroupMsg(pVgroup, NULL); pVgroup = pVgroup->next; } return TSDB_CODE_ACTION_IN_PROGRESS; @@ -371,7 +405,7 @@ int32_t mgmtDropDb(SDbObj *pDb) { } } -int32_t mgmtDropDbByName(SAcctObj *pAcct, char *name, short ignoreNotExists) { +static int32_t mgmtDropDbByName(SAcctObj *pAcct, char *name, short ignoreNotExists) { SDbObj *pDb = (SDbObj *)sdbGetRow(tsDbSdb, name); if (pDb == NULL) { if (ignoreNotExists) return TSDB_CODE_SUCCESS; @@ -394,7 +428,8 @@ bool mgmtCheckIsMonitorDB(char *db, char *monitordb) { return (strncasecmp(dbName, monitordb, len) == 0 && len == strlen(monitordb)); } -void mgmtMonitorDbDrop(void *unused, void *unusedt) { +UNUSED_FUNC +static void mgmtMonitorDbDrop(void *unused, void *unusedt) { void * pNode = NULL; SDbObj *pDb = NULL; @@ -407,7 +442,7 @@ void mgmtMonitorDbDrop(void *unused, void *unusedt) { } } -int32_t mgmtAlterDb(SAcctObj *pAcct, SAlterDbMsg *pAlter) { +static int32_t mgmtAlterDb(SAcctObj *pAcct, SAlterDbMsg *pAlter) { return 0; // int32_t code = TSDB_CODE_SUCCESS; // @@ -527,7 +562,7 @@ void mgmtCleanUpDbs() { sdbCloseTable(tsDbSdb); } -int32_t mgmtGetDbMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) { +static int32_t mgmtGetDbMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) { int32_t cols = 0; SSchema *pSchema = tsGetSchema(pMeta); @@ -676,7 +711,7 @@ char *mgmtGetDbStr(char *src) { return ++pos; } -int32_t mgmtRetrieveDbs(SShowObj *pShow, char *data, int32_t rows, void *pConn) { +static int32_t mgmtRetrieveDbs(SShowObj *pShow, char *data, int32_t rows, void *pConn) { int32_t numOfRows = 0; SDbObj *pDb = NULL; char * pWrite; @@ -868,3 +903,94 @@ void mgmtAddTableIntoDb(SDbObj *pDb) { void mgmtRemoveTableFromDb(SDbObj *pDb) { atomic_add_fetch_32(&pDb->numOfTables, -1); } + +static void mgmtProcessCreateDbMsg(SRpcMsg *rpcMsg) { + SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; + if (mgmtCheckRedirect(rpcMsg->handle)) return; + + SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); + if (pUser == NULL) { + rpcRsp.code = TSDB_CODE_INVALID_USER; + rpcSendResponse(&rpcRsp); + return; + } + + SCreateDbMsg *pCreate = (SCreateDbMsg *) rpcMsg->pCont; + + pCreate->maxSessions = htonl(pCreate->maxSessions); + pCreate->cacheBlockSize = htonl(pCreate->cacheBlockSize); + pCreate->daysPerFile = htonl(pCreate->daysPerFile); + pCreate->daysToKeep = htonl(pCreate->daysToKeep); + pCreate->daysToKeep1 = htonl(pCreate->daysToKeep1); + pCreate->daysToKeep2 = htonl(pCreate->daysToKeep2); + pCreate->commitTime = htonl(pCreate->commitTime); + pCreate->blocksPerTable = htons(pCreate->blocksPerTable); + pCreate->rowsInFileBlock = htonl(pCreate->rowsInFileBlock); + // pCreate->cacheNumOfBlocks = htonl(pCreate->cacheNumOfBlocks); + + if (mgmtCheckExpired()) { + rpcRsp.code = TSDB_CODE_GRANT_EXPIRED; + } else if (!pUser->writeAuth) { + rpcRsp.code = TSDB_CODE_NO_RIGHTS; + } else { + rpcRsp.code = mgmtCreateDb(pUser->pAcct, pCreate); + if (rpcRsp.code == TSDB_CODE_SUCCESS) { + mLPrint("DB:%s is created by %s", pCreate->db, pUser->user); + } + } + + rpcSendResponse(&rpcRsp); +} + +static void mgmtProcessAlterDbMsg(SRpcMsg *rpcMsg) { + SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; + if (mgmtCheckRedirect(rpcMsg->handle)) return; + + SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); + if (pUser == NULL) { + rpcRsp.code = TSDB_CODE_INVALID_USER; + rpcSendResponse(&rpcRsp); + return; + } + + SAlterDbMsg *pAlter = (SAlterDbMsg *) rpcMsg->pCont; + pAlter->daysPerFile = htonl(pAlter->daysPerFile); + pAlter->daysToKeep = htonl(pAlter->daysToKeep); + pAlter->maxSessions = htonl(pAlter->maxSessions) + 1; + + if (!pUser->writeAuth) { + rpcRsp.code = TSDB_CODE_NO_RIGHTS; + } else { + rpcRsp.code = mgmtAlterDb(pUser->pAcct, pAlter); + if (rpcRsp.code == TSDB_CODE_SUCCESS) { + mLPrint("DB:%s is altered by %s", pAlter->db, pUser->user); + } + } + + rpcSendResponse(&rpcRsp); +} + + +static void mgmtProcessDropDbMsg(SRpcMsg *rpcMsg) { + SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; + if (mgmtCheckRedirect(rpcMsg->handle)) return; + + SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); + if (pUser == NULL) { + rpcRsp.code = TSDB_CODE_INVALID_USER; + rpcSendResponse(&rpcRsp); + return ; + } + + if (pUser->superAuth) { + SDropDbMsg *pDrop = rpcMsg->pCont; + rpcRsp.code = mgmtDropDbByName(pUser->pAcct, pDrop->db, pDrop->ignoreNotExists); + if (rpcRsp.code == TSDB_CODE_SUCCESS) { + mLPrint("DB:%s is dropped by %s", pDrop->db, pUser->user); + } + } else { + rpcRsp.code = TSDB_CODE_NO_RIGHTS; + } + + rpcSendResponse(&rpcRsp); +} diff --git a/src/mnode/src/mgmtDnode.c b/src/mnode/src/mgmtDnode.c index a9c784eca9573584f0aa5ec9df30d8da09016711..576b7ebf6ef6088b79ecd7db99397faa4519cce1 100644 --- a/src/mnode/src/mgmtDnode.c +++ b/src/mnode/src/mgmtDnode.c @@ -18,9 +18,11 @@ #include "tmodule.h" #include "tschemautil.h" #include "tstatus.h" -#include "mnode.h" -#include "mgmtDnode.h" #include "mgmtBalance.h" +#include "mgmtDnode.h" +#include "mgmtDClient.h" +#include "mgmtMnode.h" +#include "mgmtShell.h" #include "mgmtUser.h" #include "mgmtVgroup.h" @@ -30,14 +32,18 @@ SDnodeObj *(*mgmtGetDnodeFp)(uint32_t ip) = NULL; int32_t (*mgmtGetDnodesNumFp)() = NULL; int32_t (*mgmtUpdateDnodeFp)(SDnodeObj *pDnode) = NULL; void * (*mgmtGetNextDnodeFp)(SShowObj *pShow, SDnodeObj **pDnode) = NULL; -int32_t (*mgmtGetScoresMetaFp)(STableMeta *pMeta, SShowObj *pShow, void *pConn) = NULL; -int32_t (*mgmtRetrieveScoresFp)(SShowObj *pShow, char *data, int32_t rows, void *pConn) = NULL; void (*mgmtSetDnodeUnRemoveFp)(SDnodeObj *pDnode) = NULL; -int32_t (*mgmtCreateDnodeFp)(uint32_t ip) = NULL; -int32_t (*mgmtDropDnodeByIpFp)(uint32_t ip) = NULL; - static SDnodeObj tsDnodeObj = {0}; +static void * mgmtGetNextDnode(SShowObj *pShow, SDnodeObj **pDnode); +static bool mgmtCheckConfigShow(SGlobalConfig *cfg); +static int32_t mgmtGetModuleMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn); +static int32_t mgmtRetrieveModules(SShowObj *pShow, char *data, int32_t rows, void *pConn); +static int32_t mgmtGetConfigMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn); +static int32_t mgmtRetrieveConfigs(SShowObj *pShow, char *data, int32_t rows, void *pConn); +static int32_t mgmtGetVnodeMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn); +static int32_t mgmtRetrieveVnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn); +static void mgmtProcessCfgDnodeMsg(SRpcMsg *rpcMsg); void mgmtSetDnodeMaxVnodes(SDnodeObj *pDnode) { int32_t maxVnodes = pDnode->numOfCores * tsNumOfVnodesPerCore; @@ -111,122 +117,6 @@ void mgmtUnSetDnodeVgid(SVnodeGid vnodeGid[], int32_t numOfVnodes) { } } -int32_t mgmtGetDnodeMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) { - int32_t cols = 0; - - SUserObj *pUser = mgmtGetUserFromConn(pConn); - if (pUser == NULL) return 0; - - if (strcmp(pUser->user, "root") != 0) return TSDB_CODE_NO_RIGHTS; - - SSchema *pSchema = tsGetSchema(pMeta); - - pShow->bytes[cols] = 16; - pSchema[cols].type = TSDB_DATA_TYPE_BINARY; - strcpy(pSchema[cols].name, "IP"); - pSchema[cols].bytes = htons(pShow->bytes[cols]); - cols++; - - pShow->bytes[cols] = 8; - pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP; - strcpy(pSchema[cols].name, "created time"); - pSchema[cols].bytes = htons(pShow->bytes[cols]); - cols++; - - pShow->bytes[cols] = 2; - pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT; - strcpy(pSchema[cols].name, "open vnodes"); - pSchema[cols].bytes = htons(pShow->bytes[cols]); - cols++; - - pShow->bytes[cols] = 2; - pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT; - strcpy(pSchema[cols].name, "free vnodes"); - pSchema[cols].bytes = htons(pShow->bytes[cols]); - cols++; - - pShow->bytes[cols] = 10; - pSchema[cols].type = TSDB_DATA_TYPE_BINARY; - strcpy(pSchema[cols].name, "status"); - pSchema[cols].bytes = htons(pShow->bytes[cols]); - cols++; - - pShow->bytes[cols] = 18; - pSchema[cols].type = TSDB_DATA_TYPE_BINARY; - strcpy(pSchema[cols].name, "balance state"); - 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"); - pSchema[cols].bytes = htons(pShow->bytes[cols]); - cols++; - - pMeta->numOfColumns = htons(cols); - pShow->numOfColumns = cols; - - pShow->offset[0] = 0; - for (int32_t i = 1; i < cols; ++i) { - pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1]; - } - - pShow->numOfRows = mgmtGetDnodesNum(); - pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1]; - pShow->pNode = NULL; - - return 0; -} - -int32_t mgmtRetrieveDnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn) { - int32_t numOfRows = 0; - int32_t cols = 0; - SDnodeObj *pDnode = NULL; - char *pWrite; - char ipstr[20]; - - while (numOfRows < rows) { - pShow->pNode = mgmtGetNextDnode(pShow, (SDnodeObj **)&pDnode); - if (pDnode == NULL) break; - - cols = 0; - - tinet_ntoa(ipstr, pDnode->privateIp); - pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; - strcpy(pWrite, ipstr); - cols++; - - pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; - *(int64_t *)pWrite = pDnode->createdTime; - cols++; - - pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; - *(int16_t *)pWrite = pDnode->openVnodes; - cols++; - - pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; - *(int16_t *)pWrite = pDnode->numOfFreeVnodes; - cols++; - - pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; - strcpy(pWrite, taosGetDnodeStatusStr(pDnode->status) ); - cols++; - - pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; - strcpy(pWrite, taosGetDnodeLbStatusStr(pDnode->lbStatus)); - cols++; - - tinet_ntoa(ipstr, pDnode->publicIp); - pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; - strcpy(pWrite, ipstr); - cols++; - - numOfRows++; - } - - pShow->numOfReads += numOfRows; - return numOfRows; -} bool mgmtCheckModuleInDnode(SDnodeObj *pDnode, int32_t moduleType) { uint32_t status = pDnode->moduleStatus & (1 << moduleType); @@ -326,7 +216,7 @@ int32_t mgmtRetrieveModules(SShowObj *pShow, char *data, int32_t rows, void *pCo return numOfRows; } -int32_t mgmtGetConfigMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) { +static int32_t mgmtGetConfigMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) { int32_t cols = 0; SUserObj *pUser = mgmtGetUserFromConn(pConn); @@ -367,7 +257,7 @@ int32_t mgmtGetConfigMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) { return 0; } -int32_t mgmtRetrieveConfigs(SShowObj *pShow, char *data, int32_t rows, void *pConn) { +static int32_t mgmtRetrieveConfigs(SShowObj *pShow, char *data, int32_t rows, void *pConn) { int32_t numOfRows = 0; for (int32_t i = tsGlobalConfigNum - 1; i >= 0 && numOfRows < rows; --i) { @@ -414,7 +304,7 @@ int32_t mgmtRetrieveConfigs(SShowObj *pShow, char *data, int32_t rows, void *pCo return numOfRows; } -int32_t mgmtGetVnodeMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) { +static int32_t mgmtGetVnodeMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) { int32_t cols = 0; SUserObj *pUser = mgmtGetUserFromConn(pConn); if (pUser == NULL) return 0; @@ -488,7 +378,7 @@ int32_t mgmtGetVnodeMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) { return 0; } -int32_t mgmtRetrieveVnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn) { +static int32_t mgmtRetrieveVnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn) { int32_t numOfRows = 0; SDnodeObj *pDnode = NULL; char * pWrite; @@ -538,6 +428,14 @@ int32_t mgmtRetrieveVnodes(SShowObj *pShow, char *data, int32_t rows, void *pCon } int32_t mgmtInitDnodes() { + mgmtAddShellShowMetaHandle(TSDB_MGMT_TABLE_MODULE, mgmtGetModuleMeta); + mgmtAddShellShowRetrieveHandle(TSDB_MGMT_TABLE_MODULE, mgmtRetrieveModules); + mgmtAddShellShowMetaHandle(TSDB_MGMT_TABLE_CONFIGS, mgmtGetConfigMeta); + mgmtAddShellShowRetrieveHandle(TSDB_MGMT_TABLE_CONFIGS, mgmtRetrieveConfigs); + mgmtAddShellShowMetaHandle(TSDB_MGMT_TABLE_VNODES, mgmtGetVnodeMeta); + mgmtAddShellShowRetrieveHandle(TSDB_MGMT_TABLE_VNODES, mgmtRetrieveVnodes); + mgmtAddShellMsgHandle(TSDB_MSG_TYPE_CM_CONFIG_DNODE, mgmtProcessCfgDnodeMsg); + if (mgmtInitDnodesFp) { return mgmtInitDnodesFp(); } else { @@ -607,25 +505,6 @@ void *mgmtGetNextDnode(SShowObj *pShow, SDnodeObj **pDnode) { return *pDnode; } -int32_t mgmtGetScoresMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) { - if (mgmtGetScoresMetaFp) { - SUserObj *pUser = mgmtGetUserFromConn(pConn); - if (pUser == NULL) return 0; - if (strcmp(pUser->user, "root") != 0) return TSDB_CODE_NO_RIGHTS; - return mgmtGetScoresMetaFp(pMeta, pShow, pConn); - } else { - return TSDB_CODE_OPS_NOT_SUPPORT; - } -} - -int32_t mgmtRetrieveScores(SShowObj *pShow, char *data, int32_t rows, void *pConn) { - if (mgmtRetrieveScoresFp) { - return mgmtRetrieveScoresFp(pShow, data, rows, pConn); - } else { - return 0; - } -} - void mgmtSetDnodeUnRemove(SDnodeObj *pDnode) { if (mgmtSetDnodeUnRemoveFp) { mgmtSetDnodeUnRemoveFp(pDnode); @@ -640,16 +519,49 @@ bool mgmtCheckConfigShow(SGlobalConfig *cfg) { return true; } -/** - * check if a dnode in remove state - **/ bool mgmtCheckDnodeInRemoveState(SDnodeObj *pDnode) { return pDnode->lbStatus == TSDB_DN_LB_STATUS_OFFLINE_REMOVING || pDnode->lbStatus == TSDB_DN_LB_STATE_SHELL_REMOVING; } -/** - * check if a dnode in offline state - **/ bool mgmtCheckDnodeInOfflineState(SDnodeObj *pDnode) { return pDnode->status == TSDB_DN_STATUS_OFFLINE; } + +void mgmtProcessCfgDnodeMsg(SRpcMsg *rpcMsg) { + SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; + if (mgmtCheckRedirect(rpcMsg->handle)) return; + + SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); + if (pUser == NULL) { + rpcRsp.code = TSDB_CODE_INVALID_USER; + rpcSendResponse(&rpcRsp); + return; + } + + SCMCfgDnodeMsg *pCmCfgDnode = (SCMCfgDnodeMsg *) rpcMsg->pCont; + uint32_t dnodeIp = inet_addr(pCmCfgDnode->ip); + + if (strcmp(pUser->pAcct->user, "root") != 0) { + rpcRsp.code = TSDB_CODE_NO_RIGHTS; + } else { + SRpcIpSet ipSet = mgmtGetIpSetFromIp(dnodeIp); + SMDCfgDnodeMsg *pMdCfgDnode = rpcMallocCont(sizeof(SMDCfgDnodeMsg)); + strcpy(pMdCfgDnode->ip, pCmCfgDnode->ip); + strcpy(pMdCfgDnode->config, pCmCfgDnode->config); + SRpcMsg rpcMdCfgDnodeMsg = { + .handle = 0, + .code = 0, + .msgType = TSDB_MSG_TYPE_MD_CONFIG_DNODE, + .pCont = pMdCfgDnode, + .contLen = sizeof(SMDCfgDnodeMsg) + }; + mgmtSendMsgToDnode(&ipSet, &rpcMdCfgDnodeMsg); + rpcRsp.code = TSDB_CODE_SUCCESS; + } + + if (rpcRsp.code == TSDB_CODE_SUCCESS) { + mTrace("dnode:%s is configured by %s", pCmCfgDnode->ip, pUser->user); + } + + rpcSendResponse(&rpcRsp); +} diff --git a/src/mnode/src/mgmtGrant.c b/src/mnode/src/mgmtGrant.c index 0ea212b86f8438ec9fe5c0adb1b8ea6f04c79499..be1861e45b3b411fd5a448d0b51126261c51d789 100644 --- a/src/mnode/src/mgmtGrant.c +++ b/src/mnode/src/mgmtGrant.c @@ -15,21 +15,14 @@ #define _DEFAULT_SOURCE #include "os.h" -#include "mnode.h" #include "mgmtAcct.h" -#include "mgmtGrant.h" -#include "mgmtUser.h" int32_t (*mgmtCheckUserGrantFp)() = NULL; int32_t (*mgmtCheckDbGrantFp)() = NULL; -int32_t (*mgmtCheckDnodeGrantFp)() = NULL; void (*mgmtAddTimeSeriesFp)(uint32_t timeSeriesNum) = NULL; void (*mgmtRestoreTimeSeriesFp)(uint32_t timeSeriesNum) = NULL; int32_t (*mgmtCheckTimeSeriesFp)(uint32_t timeseries) = NULL; bool (*mgmtCheckExpiredFp)() = NULL; -int32_t (*mgmtGetGrantsMetaFp)(STableMeta *pMeta, SShowObj *pShow, void *pConn) = NULL; -int32_t (*mgmtRetrieveGrantsFp)(SShowObj *pShow, char *data, int rows, void *pConn) = NULL; -void (*mgmtUpdateGrantInfoFp)(void *pCont) = NULL; int32_t mgmtCheckUserGrant() { if (mgmtCheckUserGrantFp) { @@ -47,14 +40,6 @@ int32_t mgmtCheckDbGrant() { } } -int32_t mgmtCheckDnodeGrant() { - if (mgmtCheckDnodeGrantFp) { - return (*mgmtCheckDnodeGrantFp)(); - } else { - return 0; - } -} - void mgmtAddTimeSeries(SAcctObj *pAcct, uint32_t timeSeriesNum) { pAcct->acctInfo.numOfTimeSeries += timeSeriesNum; if (mgmtAddTimeSeriesFp) { @@ -84,22 +69,3 @@ bool mgmtCheckExpired() { return false; } } - -int32_t mgmtGetGrantsMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) { - if (mgmtGetGrantsMetaFp) { - SUserObj *pUser = mgmtGetUserFromConn(pConn); - if (pUser == NULL) return 0; - if (strcmp(pUser->user, "root") != 0) return TSDB_CODE_NO_RIGHTS; - return mgmtGetGrantsMetaFp(pMeta, pShow, pConn); - } else { - return TSDB_CODE_OPS_NOT_SUPPORT; - } -} - -int32_t mgmtRetrieveGrants(SShowObj *pShow, char *data, int32_t rows, void *pConn) { - if (mgmtRetrieveGrantsFp) { - return mgmtRetrieveGrantsFp(pShow, data, rows, pConn); - } else { - return 0; - } -} diff --git a/src/mnode/src/mgmtMnode.c b/src/mnode/src/mgmtMnode.c index 5ed09b810fa57ce80889a412b0ebd8b1d097ce0b..0b8c7797d9f0e88514f87638c0bd88e4b3284649 100644 --- a/src/mnode/src/mgmtMnode.c +++ b/src/mnode/src/mgmtMnode.c @@ -14,151 +14,8 @@ */ #define _DEFAULT_SOURCE -#include "os.h" -#include "trpc.h" -#include "tschemautil.h" #include "mgmtMnode.h" -#include "mgmtUser.h" - -int32_t (*mgmtAddMnodeFp)(uint32_t privateIp, uint32_t publicIp) = NULL; -int32_t (*mgmtRemoveMnodeFp)(uint32_t privateIp) = NULL; -int32_t (*mgmtGetMnodesNumFp)() = NULL; -void * (*mgmtGetNextMnodeFp)(SShowObj *pShow, SSdbPeer **pMnode) = NULL; bool mgmtCheckRedirect(void *handle) { - return false; -} - -int32_t mgmtAddMnode(uint32_t privateIp, uint32_t publicIp) { - if (mgmtAddMnodeFp) { - return (*mgmtAddMnodeFp)(privateIp, publicIp); - } else { - return 0; - } -} - -int32_t mgmtRemoveMnode(uint32_t privateIp) { - if (mgmtRemoveMnodeFp) { - return (*mgmtRemoveMnodeFp)(privateIp); - } else { - return 0; - } -} - -static int32_t mgmtGetMnodesNum() { - if (mgmtGetMnodesNumFp) { - return (*mgmtGetMnodesNumFp)(); - } else { - return 1; - } -} - -static void *mgmtGetNextMnode(SShowObj *pShow, SSdbPeer **pMnode) { - if (mgmtGetNextMnodeFp) { - return (*mgmtGetNextMnodeFp)(pShow, pMnode); - } else { - if (*pMnode == NULL) { - *pMnode = NULL; - } else { - *pMnode = NULL; - } - } - - return *pMnode; -} - -int32_t mgmtGetMnodeMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) { - int32_t cols = 0; - - SUserObj *pUser = mgmtGetUserFromConn(pConn); - if (pUser == NULL) return 0; - - if (strcmp(pUser->user, "root") != 0) return TSDB_CODE_NO_RIGHTS; - - SSchema *pSchema = tsGetSchema(pMeta); - - pShow->bytes[cols] = 16; - pSchema[cols].type = TSDB_DATA_TYPE_BINARY; - strcpy(pSchema[cols].name, "IP"); - pSchema[cols].bytes = htons(pShow->bytes[cols]); - cols++; - - pShow->bytes[cols] = 8; - pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP; - strcpy(pSchema[cols].name, "created time"); - pSchema[cols].bytes = htons(pShow->bytes[cols]); - cols++; - - pShow->bytes[cols] = 10; - pSchema[cols].type = TSDB_DATA_TYPE_BINARY; - strcpy(pSchema[cols].name, "status"); - pSchema[cols].bytes = htons(pShow->bytes[cols]); - cols++; - - pShow->bytes[cols] = 10; - pSchema[cols].type = TSDB_DATA_TYPE_BINARY; - strcpy(pSchema[cols].name, "role"); - 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"); - pSchema[cols].bytes = htons(pShow->bytes[cols]); - cols++; - - pMeta->numOfColumns = htons(cols); - pShow->numOfColumns = cols; - - pShow->offset[0] = 0; - for (int32_t i = 1; i < cols; ++i) { - pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1]; - } - - pShow->numOfRows = mgmtGetMnodesNum(); - pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1]; - pShow->pNode = NULL; - - return 0; -} - -int32_t mgmtRetrieveMnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn) { - int32_t numOfRows = 0; - int32_t cols = 0; - SSdbPeer *pMnode = NULL; - char *pWrite; - char ipstr[20]; - - while (numOfRows < rows) { - pShow->pNode = mgmtGetNextMnode(pShow, (SSdbPeer **)&pMnode); - if (pMnode == NULL) break; - - cols = 0; - - pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; - strcpy(pWrite, pMnode->ipstr); - cols++; - - pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; - *(int64_t *)pWrite = pMnode->createdTime; - cols++; - - pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; - strcpy(pWrite, sdbStatusStr[(uint8_t)pMnode->status]); - cols++; - - pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; - strcpy(pWrite, sdbRoleStr[(uint8_t)pMnode->role]); - cols++; - - tinet_ntoa(ipstr, pMnode->publicIp); - pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; - strcpy(pWrite, ipstr); - cols++; - - numOfRows++; - } - - pShow->numOfReads += numOfRows; - return numOfRows; -} + return true; +} \ No newline at end of file diff --git a/src/mnode/src/mgmtNormalTable.c b/src/mnode/src/mgmtNormalTable.c index e4cc6c9b4ca4737d34449ed98ca9c62aa774c4ac..3e215888df8900c7006b8c9b2d5a360b5beda4c8 100644 --- a/src/mnode/src/mgmtNormalTable.c +++ b/src/mnode/src/mgmtNormalTable.c @@ -24,6 +24,7 @@ #include "mnode.h" #include "mgmtAcct.h" #include "mgmtDb.h" +#include "mgmtDClient.h" #include "mgmtGrant.h" #include "mgmtNormalTable.h" #include "mgmtSuperTable.h" @@ -422,7 +423,15 @@ int32_t mgmtDropNormalTable(SDbObj *pDb, SNormalTableObj *pTable) { } SRpcIpSet ipSet = mgmtGetIpSetFromVgroup(pVgroup); - mgmtSendDropTableMsg(pRemove, &ipSet, NULL); + mTrace("table:%s, send drop table msg", pRemove->tableId); + SRpcMsg rpcMsg = { + .handle = 0, + .pCont = pRemove, + .contLen = sizeof(SMDDropTableMsg), + .code = 0, + .msgType = TSDB_MSG_TYPE_MD_DROP_TABLE + }; + mgmtSendMsgToDnode(&ipSet, &rpcMsg); if (sdbDeleteRow(tsNormalTableSdb, pTable) < 0) { mError("table:%s, update ntables sdb error", pTable->tableId); diff --git a/src/mnode/src/mgmtProfile.c b/src/mnode/src/mgmtProfile.c index d8cc5af06b4cbbf9546d227314bd18c8edba4745..eafa860596d9c5b3398237ebce82f8bf0c6464e5 100644 --- a/src/mnode/src/mgmtProfile.c +++ b/src/mnode/src/mgmtProfile.c @@ -17,7 +17,16 @@ #include "os.h" #include "taosmsg.h" #include "tschemautil.h" +#include "mgmtMnode.h" #include "mgmtProfile.h" +#include "mgmtShell.h" +#include "mgmtUser.h" + +int32_t mgmtSaveQueryStreamList(SHeartBeatMsg *pHBMsg); + +int32_t mgmtKillQuery(char *qidstr, void *pConn); +int32_t mgmtKillStream(char *qidstr, void *pConn); +int32_t mgmtKillConnection(char *qidstr, void *pConn); typedef struct { char user[TSDB_TABLE_ID_LEN + 1]; @@ -663,3 +672,92 @@ int32_t mgmtRetrieveConns(SShowObj *pShow, char *data, int32_t rows, void *pConn pShow->numOfReads += numOfRows; return numOfRows; } + +void mgmtProcessKillQueryMsg(SRpcMsg *rpcMsg) { + SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; + if (mgmtCheckRedirect(rpcMsg->handle)) return; + + SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); + if (pUser == NULL) { + rpcRsp.code = TSDB_CODE_INVALID_USER; + rpcSendResponse(&rpcRsp); + return; + } + + SKillQueryMsg *pKill = (SKillQueryMsg *) rpcMsg->pCont; + int32_t code; + + if (!pUser->writeAuth) { + code = TSDB_CODE_NO_RIGHTS; + } else { + code = mgmtKillQuery(pKill->queryId, rpcMsg->handle); + } + + rpcRsp.code = code; + rpcSendResponse(&rpcRsp); +} + +void mgmtProcessKillStreamMsg(SRpcMsg *rpcMsg) { + SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; + if (mgmtCheckRedirect(rpcMsg->handle)) return; + + SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); + if (pUser == NULL) { + rpcRsp.code = TSDB_CODE_INVALID_USER; + rpcSendResponse(&rpcRsp); + return; + } + + SKillStreamMsg *pKill = (SKillStreamMsg *) rpcMsg->pCont; + int32_t code; + + if (!pUser->writeAuth) { + code = TSDB_CODE_NO_RIGHTS; + } else { + code = mgmtKillStream(pKill->queryId, rpcMsg->handle); + } + + rpcRsp.code = code; + rpcSendResponse(&rpcRsp); +} + +void mgmtProcessKillConnectionMsg(SRpcMsg *rpcMsg) { + SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; + if (mgmtCheckRedirect(rpcMsg->handle)) return; + + SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); + if (pUser == NULL) { + rpcRsp.code = TSDB_CODE_INVALID_USER; + rpcSendResponse(&rpcRsp); + return; + } + + SKillConnectionMsg *pKill = (SKillConnectionMsg *) rpcMsg->pCont; + int32_t code; + + if (!pUser->writeAuth) { + code = TSDB_CODE_NO_RIGHTS; + } else { + code = mgmtKillConnection(pKill->queryId, rpcMsg->handle); + } + + rpcRsp.code = code; + rpcSendResponse(&rpcRsp); +} + +int32_t mgmtInitProfile() { + mgmtAddShellShowMetaHandle(TSDB_MGMT_TABLE_QUERIES, mgmtGetQueryMeta); + mgmtAddShellShowRetrieveHandle(TSDB_MGMT_TABLE_QUERIES, mgmtRetrieveQueries); + mgmtAddShellShowMetaHandle(TSDB_MGMT_TABLE_CONNS, mgmtGetConnsMeta); + mgmtAddShellShowRetrieveHandle(TSDB_MGMT_TABLE_CONNS, mgmtRetrieveConns); + mgmtAddShellShowMetaHandle(TSDB_MGMT_TABLE_STREAMS, mgmtGetStreamMeta); + mgmtAddShellShowRetrieveHandle(TSDB_MGMT_TABLE_STREAMS, mgmtRetrieveStreams); + mgmtAddShellMsgHandle(TSDB_MSG_TYPE_KILL_QUERY, mgmtProcessKillQueryMsg); + mgmtAddShellMsgHandle(TSDB_MSG_TYPE_KILL_STREAM, mgmtProcessKillStreamMsg); + mgmtAddShellMsgHandle(TSDB_MSG_TYPE_KILL_CONNECTION, mgmtProcessKillConnectionMsg); + + return 0; +} + +void mgmtCleanUpProfile() { +} diff --git a/src/mnode/src/mgmtShell.c b/src/mnode/src/mgmtShell.c index 28706b99c0272666af7000b82ce664d5aec09fa9..6d02bbf18ad77eec0685cfe46167f77c1371141f 100644 --- a/src/mnode/src/mgmtShell.c +++ b/src/mnode/src/mgmtShell.c @@ -44,7 +44,11 @@ typedef int32_t (*SShowRetrieveFp)(SShowObj *pShow, char *data, int32_t rows, vo static void mgmtProcessMsgFromShell(SRpcMsg *pMsg); static void mgmtProcessShowMsg(SRpcMsg *rpcMsg); static void mgmtProcessRetrieveMsg(SRpcMsg *rpcMsg); +static void mgmtProcessUnSupportMsg(SRpcMsg *rpcMsg); static int mgmtShellRetriveAuth(char *user, char *spi, char *encrypt, char *secret, char *ckey); +static bool mgmtCheckMsgReadOnly(int8_t type, void *pCont); +static void mgmtProcessHeartBeatMsg(SRpcMsg *rpcMsg); +static void mgmtProcessConnectMsg(SRpcMsg *rpcMsg); static void *tsMgmtShellRpc = NULL; static void (*tsMgmtProcessShellMsgFp[TSDB_MSG_TYPE_MAX])(SRpcMsg *) = {0}; @@ -77,6 +81,9 @@ int32_t mgmtInitShell() { return -1; } + mgmtAddShellMsgHandle(TSDB_MSG_TYPE_HEARTBEAT, mgmtProcessHeartBeatMsg); + mgmtAddShellMsgHandle(TSDB_MSG_TYPE_CONNECT, mgmtProcessConnectMsg); + mPrint("server connection to shell is opened"); return 0; } @@ -101,411 +108,42 @@ void mgmtAddShellShowRetrieveHandle(uint8_t msgType, SShowRetrieveFp fp) { tsMgmtShowRetrieveFp[msgType] = fp; } +void mgmtProcessTranRequest(SSchedMsg *sched) { + SRpcMsg *rpcMsg = sched->msg; + (*tsMgmtProcessShellMsgFp[rpcMsg->msgType])(rpcMsg); + rpcFreeCont(rpcMsg->pCont); +} + +void mgmtAddToTranRequest(SRpcMsg *rpcMsg) { + SSchedMsg schedMsg; + schedMsg.msg = rpcMsg; + schedMsg.fp = mgmtProcessTranRequest; + taosScheduleTask(tsMgmtTranQhandle, &schedMsg); +} + static void mgmtProcessMsgFromShell(SRpcMsg *rpcMsg) { + if (sdbGetRunStatus() != SDB_STATUS_SERVING) { + mTrace("shell msg is ignored since SDB is not ready"); + SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = TSDB_CODE_NOT_READY, .msgType = 0}; + rpcSendResponse(&rpcRsp); + rpcFreeCont(rpcMsg->pCont); + return; + } + if (tsMgmtProcessShellMsgFp[rpcMsg->msgType]) { - (*tsMgmtProcessShellMsgFp[rpcMsg->msgType])(rpcMsg); + if (mgmtCheckMsgReadOnly(rpcMsg->msgType, rpcMsg->pCont)) { + (*tsMgmtProcessShellMsgFp[rpcMsg->msgType])(rpcMsg); + rpcFreeCont(rpcMsg->pCont); + } else { + mgmtAddToTranRequest(rpcMsg); + } } else { mError("%s is not processed", taosMsg[rpcMsg->msgType]); + mgmtProcessUnSupportMsg(rpcMsg); + rpcFreeCont(rpcMsg->pCont); } - - rpcFreeCont(rpcMsg->pCont); } - -//static void mgmtInitShowMsgFp(); -//static void mgmtInitProcessShellMsg(); -//static void mgmtProcessMsgFromShell(SRpcMsg *msg); -//static void (*mgmtProcessShellMsg[TSDB_MSG_TYPE_MAX])(SRpcMsg *msg); -//static void mgmtProcessUnSupportMsg(SRpcMsg *msg); -// -//void *tsMgmtShellRpc = NULL; -// -//void mgmtProcessTranRequest(SSchedMsg *sched) { -// SRpcMsg rpcMsg; -// rpcMsg.msgType = *(int8_t *) (sched->msg); -// rpcMsg.contLen = *(int32_t *) (sched->msg + sizeof(int8_t)); -// rpcMsg.pCont = sched->msg + sizeof(int32_t) + sizeof(int8_t); -// rpcMsg.handle = sched->thandle; -// rpcMsg.code = TSDB_CODE_SUCCESS; -// -// (*mgmtProcessShellMsg[rpcMsg.msgType])(&rpcMsg); -// if (sched->msg) { -// free(sched->msg); -// } -//} -// -//void mgmtAddToTranRequest(SRpcMsg *rpcMsg) { -// SSchedMsg schedMsg; -// schedMsg.msg = malloc(rpcMsg->contLen + sizeof(int32_t) + sizeof(int8_t)); -// schedMsg.fp = mgmtProcessTranRequest; -// schedMsg.tfp = NULL; -// schedMsg.thandle = rpcMsg->handle; -// *(int8_t *) (schedMsg.msg) = rpcMsg->msgType; -// *(int32_t *) (schedMsg.msg + sizeof(int8_t)) = rpcMsg->contLen; -// memcpy(schedMsg.msg + sizeof(int32_t) + sizeof(int8_t), rpcMsg->pCont, rpcMsg->contLen); -// -// taosScheduleTask(tsMgmtTranQhandle, &schedMsg); -//} -// - -// -//void mgmtProcessTableMetaMsg(SRpcMsg *rpcMsg) { -// SRpcMsg rpcRsp; -// rpcRsp.handle = rpcMsg->handle; -// rpcRsp.pCont = NULL; -// rpcRsp.contLen = 0; -// -// STableInfoMsg *pInfo = rpcMsg->pCont; -// pInfo->createFlag = htons(pInfo->createFlag); -// -// SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); -// if (pUser == NULL) { -// mError("table:%s, failed to get table meta, invalid user", pInfo->tableId); -// rpcRsp.code = TSDB_CODE_INVALID_USER; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// STableInfo *pTable = mgmtGetTable(pInfo->tableId); -// if (pTable == NULL) { -// if (pInfo->createFlag != 1) { -// mError("table:%s, failed to get table meta, table not exist", pInfo->tableId); -// rpcRsp.code = TSDB_CODE_INVALID_TABLE; -// rpcSendResponse(&rpcRsp); -// return; -// } else { -// // on demand create table from super table if table does not exists -// if (mgmtCheckRedirect(rpcMsg->handle) != TSDB_CODE_SUCCESS) { -// mError("table:%s, failed to create table while get meta info, need redirect message", pInfo->tableId); -// return; -// } -// -// int32_t contLen = sizeof(SCreateTableMsg) + sizeof(STagData); -// SCreateTableMsg *pCreateMsg = rpcMallocCont(contLen); -// if (pCreateMsg == NULL) { -// mError("table:%s, failed to create table while get meta info, no enough memory", pInfo->tableId); -// rpcRsp.code = TSDB_CODE_SERV_OUT_OF_MEMORY; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// memcpy(pCreateMsg->schema, pInfo->tags, sizeof(STagData)); -// strcpy(pCreateMsg->tableId, pInfo->tableId); -// -// mError("table:%s, start to create table while get meta info", pInfo->tableId); -// mgmtCreateTable(pCreateMsg, contLen, rpcMsg->handle, true); -// } -// } else { -// mgmtProcessGetTableMeta(pTable, rpcMsg->handle); -// } -//} -// -//void mgmtProcessMultiTableMetaMsg(SRpcMsg *rpcMsg) { -// SRpcMsg rpcRsp; -// rpcRsp.handle = rpcMsg->handle; -// rpcRsp.pCont = NULL; -// rpcRsp.contLen = 0; -// -// SRpcConnInfo connInfo; -// rpcGetConnInfo(rpcMsg->handle, &connInfo); -// -// bool usePublicIp = (connInfo.serverIp == tsPublicIpInt); -// SUserObj *pUser = mgmtGetUser(connInfo.user); -// if (pUser == NULL) { -// rpcRsp.code = TSDB_CODE_INVALID_USER; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// SMultiTableInfoMsg *pInfo = rpcMsg->pCont; -// pInfo->numOfTables = htonl(pInfo->numOfTables); -// -// int32_t totalMallocLen = 4*1024*1024; // first malloc 4 MB, subsequent reallocation as twice -// SMultiTableMeta *pMultiMeta = rpcMallocCont(totalMallocLen); -// if (pMultiMeta == NULL) { -// rpcRsp.code = TSDB_CODE_SERV_OUT_OF_MEMORY; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// pMultiMeta->contLen = sizeof(SMultiTableMeta); -// pMultiMeta->numOfTables = 0; -// -// for (int t = 0; t < pInfo->numOfTables; ++t) { -// char *tableId = (char*)(pInfo->tableIds + t * TSDB_TABLE_ID_LEN); -// STableInfo *pTable = mgmtGetTable(tableId); -// if (pTable == NULL) continue; -// -// SDbObj *pDb = mgmtGetDbByTableId(tableId); -// if (pDb == NULL) continue; -// -// int availLen = totalMallocLen - pMultiMeta->contLen; -// if (availLen <= sizeof(STableMeta) + sizeof(SSchema) * TSDB_MAX_COLUMNS) { -// //TODO realloc -// //totalMallocLen *= 2; -// //pMultiMeta = rpcReMalloc(pMultiMeta, totalMallocLen); -// //if (pMultiMeta == NULL) { -// /// rpcSendResponse(ahandle, TSDB_CODE_SERV_OUT_OF_MEMORY, NULL, 0); -// // return TSDB_CODE_SERV_OUT_OF_MEMORY; -// //} else { -// // t--; -// // continue; -// //} -// } -// -// STableMeta *pMeta = (STableMeta *)(pMultiMeta->metas + pMultiMeta->contLen); -// int32_t code = mgmtGetTableMeta(pDb, pTable, pMeta, usePublicIp); -// if (code == TSDB_CODE_SUCCESS) { -// pMultiMeta->numOfTables ++; -// pMultiMeta->contLen += pMeta->contLen; -// } -// } -// -// rpcRsp.pCont = pMultiMeta; -// rpcRsp.contLen = pMultiMeta->contLen; -// rpcSendResponse(&rpcRsp); -//} -// -//void mgmtProcessSuperTableMetaMsg(SRpcMsg *rpcMsg) { -// SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; -// SSuperTableInfoMsg *pInfo = rpcMsg->pCont; -// STableInfo *pTable = mgmtGetSuperTable(pInfo->tableId); -// if (pTable == NULL) { -// rpcRsp.code = TSDB_CODE_INVALID_TABLE; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// SSuperTableInfoRsp *pRsp = mgmtGetSuperTableVgroup((SSuperTableObj *) pTable); -// if (pRsp != NULL) { -// int32_t msgLen = sizeof(SSuperTableObj) + htonl(pRsp->numOfDnodes) * sizeof(int32_t); -// rpcRsp.pCont = pRsp; -// rpcRsp.contLen = msgLen; -// rpcSendResponse(&rpcRsp); -// } else { -// rpcRsp.code = TSDB_CODE_INVALID_TABLE; -// rpcSendResponse(&rpcRsp); -// } -//} -// -//void mgmtProcessCreateDbMsg(SRpcMsg *rpcMsg) { -// SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; -// -// if (mgmtCheckRedirect(rpcMsg->handle) != TSDB_CODE_SUCCESS) { -// return; -// } -// -// SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); -// if (pUser == NULL) { -// rpcRsp.code = TSDB_CODE_INVALID_USER; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// SCreateDbMsg *pCreate = (SCreateDbMsg *) rpcMsg->pCont; -// -// pCreate->maxSessions = htonl(pCreate->maxSessions); -// pCreate->cacheBlockSize = htonl(pCreate->cacheBlockSize); -// pCreate->daysPerFile = htonl(pCreate->daysPerFile); -// pCreate->daysToKeep = htonl(pCreate->daysToKeep); -// pCreate->daysToKeep1 = htonl(pCreate->daysToKeep1); -// pCreate->daysToKeep2 = htonl(pCreate->daysToKeep2); -// pCreate->commitTime = htonl(pCreate->commitTime); -// pCreate->blocksPerTable = htons(pCreate->blocksPerTable); -// pCreate->rowsInFileBlock = htonl(pCreate->rowsInFileBlock); -// // pCreate->cacheNumOfBlocks = htonl(pCreate->cacheNumOfBlocks); -// -// int32_t code; -// if (mgmtCheckExpired()) { -// code = TSDB_CODE_GRANT_EXPIRED; -// } else if (!pUser->writeAuth) { -// code = TSDB_CODE_NO_RIGHTS; -// } else { -// code = mgmtCreateDb(pUser->pAcct, pCreate); -// if (code == TSDB_CODE_SUCCESS) { -// mLPrint("DB:%s is created by %s", pCreate->db, pUser->user); -// } -// } -// -// rpcRsp.code = code; -// rpcSendResponse(&rpcRsp); -//} -// -//void mgmtProcessAlterDbMsg(SRpcMsg *rpcMsg) { -// SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; -// if (mgmtCheckRedirect(rpcMsg->handle) != TSDB_CODE_SUCCESS) { -// return; -// } -// -// SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); -// if (pUser == NULL) { -// rpcRsp.code = TSDB_CODE_INVALID_USER; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// SAlterDbMsg *pAlter = (SAlterDbMsg *) rpcMsg->pCont; -// pAlter->daysPerFile = htonl(pAlter->daysPerFile); -// pAlter->daysToKeep = htonl(pAlter->daysToKeep); -// pAlter->maxSessions = htonl(pAlter->maxSessions) + 1; -// -// int32_t code; -// if (!pUser->writeAuth) { -// code = TSDB_CODE_NO_RIGHTS; -// } else { -// code = mgmtAlterDb(pUser->pAcct, pAlter); -// if (code == TSDB_CODE_SUCCESS) { -// mLPrint("DB:%s is altered by %s", pAlter->db, pUser->user); -// } -// } -// -// rpcRsp.code = code; -// rpcSendResponse(&rpcRsp); -//} -// -//void mgmtProcessKillQueryMsg(SRpcMsg *rpcMsg) { -// SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; -// if (mgmtCheckRedirect(rpcMsg->handle) != TSDB_CODE_SUCCESS) { -// return; -// } -// -// SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); -// if (pUser == NULL) { -// rpcRsp.code = TSDB_CODE_INVALID_USER; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// SKillQueryMsg *pKill = (SKillQueryMsg *) rpcMsg->pCont; -// int32_t code; -// -// if (!pUser->writeAuth) { -// code = TSDB_CODE_NO_RIGHTS; -// } else { -// code = mgmtKillQuery(pKill->queryId, rpcMsg->handle); -// } -// -// rpcRsp.code = code; -// rpcSendResponse(&rpcRsp); -//} -// -//void mgmtProcessKillStreamMsg(SRpcMsg *rpcMsg) { -// SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; -// if (mgmtCheckRedirect(rpcMsg->handle) != TSDB_CODE_SUCCESS) { -// return; -// } -// -// SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); -// if (pUser == NULL) { -// rpcRsp.code = TSDB_CODE_INVALID_USER; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// SKillStreamMsg *pKill = (SKillStreamMsg *) rpcMsg->pCont; -// int32_t code; -// -// if (!pUser->writeAuth) { -// code = TSDB_CODE_NO_RIGHTS; -// } else { -// code = mgmtKillStream(pKill->queryId, rpcMsg->handle); -// } -// -// rpcRsp.code = code; -// rpcSendResponse(&rpcRsp); -//} -// -//void mgmtProcessKillConnectionMsg(SRpcMsg *rpcMsg) { -// SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; -// if (mgmtCheckRedirect(rpcMsg->handle) != TSDB_CODE_SUCCESS) { -// return; -// } -// -// SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); -// if (pUser == NULL) { -// rpcRsp.code = TSDB_CODE_INVALID_USER; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// SKillConnectionMsg *pKill = (SKillConnectionMsg *) rpcMsg->pCont; -// int32_t code; -// -// if (!pUser->writeAuth) { -// code = TSDB_CODE_NO_RIGHTS; -// } else { -// code = mgmtKillConnection(pKill->queryId, rpcMsg->handle); -// } -// -// rpcRsp.code = code; -// rpcSendResponse(&rpcRsp); -//} -// - -//void mgmtProcessDropDbMsg(SRpcMsg *rpcMsg) { -// SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; -// if (mgmtCheckRedirect(rpcMsg->handle) != TSDB_CODE_SUCCESS) { -// return ; -// } -// -// SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); -// if (pUser == NULL) { -// rpcRsp.code = TSDB_CODE_INVALID_USER; -// rpcSendResponse(&rpcRsp); -// return ; -// } -// -// int32_t code; -// if (pUser->superAuth) { -// SDropDbMsg *pDrop = rpcMsg->pCont; -// code = mgmtDropDbByName(pUser->pAcct, pDrop->db, pDrop->ignoreNotExists); -// if (code == TSDB_CODE_SUCCESS) { -// mLPrint("DB:%s is dropped by %s", pDrop->db, pUser->user); -// } -// } else { -// code = TSDB_CODE_NO_RIGHTS; -// } -// -// rpcRsp.code = code; -// rpcSendResponse(&rpcRsp); -//} -// -//static void mgmtInitShowMsgFp() { -// tsMgmtShowMetaFp[TSDB_MGMT_TABLE_ACCT] = mgmtGetAcctMeta; -// tsMgmtShowMetaFp[] = ; -// tsMgmtShowMetaFp[TSDB_MGMT_TABLE_DB] = mgmtGetDbMeta; -// tsMgmtShowMetaFp[TSDB_MGMT_TABLE_TABLE] = mgmtGetShowTableMeta; -// tsMgmtShowMetaFp[TSDB_MGMT_TABLE_DNODE] = mgmtGetDnodeMeta; -// tsMgmtShowMetaFp[TSDB_MGMT_TABLE_MNODE] = mgmtGetMnodeMeta; -// tsMgmtShowMetaFp[TSDB_MGMT_TABLE_VGROUP] = mgmtGetVgroupMeta; -// tsMgmtShowMetaFp[TSDB_MGMT_TABLE_METRIC] = mgmtGetShowSuperTableMeta; -// tsMgmtShowMetaFp[TSDB_MGMT_TABLE_MODULE] = mgmtGetModuleMeta; -// tsMgmtShowMetaFp[TSDB_MGMT_TABLE_QUERIES] = mgmtGetQueryMeta; -// tsMgmtShowMetaFp[TSDB_MGMT_TABLE_STREAMS] = mgmtGetStreamMeta; -// tsMgmtShowMetaFp[TSDB_MGMT_TABLE_CONFIGS] = mgmtGetConfigMeta; -// tsMgmtShowMetaFp[TSDB_MGMT_TABLE_CONNS] = mgmtGetConnsMeta; -// tsMgmtShowMetaFp[TSDB_MGMT_TABLE_SCORES] = mgmtGetScoresMeta; -// tsMgmtShowMetaFp[TSDB_MGMT_TABLE_GRANTS] = mgmtGetGrantsMeta; -// tsMgmtShowMetaFp[TSDB_MGMT_TABLE_VNODES] = mgmtGetVnodeMeta; -// -// tsMgmtShowRetrieveFp[TSDB_MGMT_TABLE_ACCT] = mgmtRetrieveAccts; -// tsMgmtShowRetrieveFp[] = ; -// tsMgmtShowRetrieveFp[TSDB_MGMT_TABLE_DB] = mgmtRetrieveDbs; -// tsMgmtShowRetrieveFp[TSDB_MGMT_TABLE_TABLE] = mgmtRetrieveShowTables; -// tsMgmtShowRetrieveFp[TSDB_MGMT_TABLE_DNODE] = mgmtRetrieveDnodes; -// tsMgmtShowRetrieveFp[TSDB_MGMT_TABLE_MNODE] = mgmtRetrieveMnodes; -// tsMgmtShowRetrieveFp[TSDB_MGMT_TABLE_VGROUP] = mgmtRetrieveVgroups; -// tsMgmtShowRetrieveFp[TSDB_MGMT_TABLE_METRIC] = mgmtRetrieveShowSuperTables; -// tsMgmtShowRetrieveFp[TSDB_MGMT_TABLE_MODULE] = mgmtRetrieveModules; -// tsMgmtShowRetrieveFp[TSDB_MGMT_TABLE_QUERIES] = mgmtRetrieveQueries; -// tsMgmtShowRetrieveFp[TSDB_MGMT_TABLE_STREAMS] = mgmtRetrieveStreams; -// tsMgmtShowRetrieveFp[TSDB_MGMT_TABLE_CONFIGS] = mgmtRetrieveConfigs; -// tsMgmtShowRetrieveFp[TSDB_MGMT_TABLE_CONNS] = mgmtRetrieveConns; -// tsMgmtShowRetrieveFp[TSDB_MGMT_TABLE_SCORES] = mgmtRetrieveScores; -// tsMgmtShowRetrieveFp[TSDB_MGMT_TABLE_GRANTS] = mgmtRetrieveGrants; -// tsMgmtShowRetrieveFp[TSDB_MGMT_TABLE_VNODES] = mgmtRetrieveVnodes; -//} - static void mgmtProcessShowMsg(SRpcMsg *rpcMsg) { SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; @@ -540,16 +178,21 @@ static void mgmtProcessShowMsg(SRpcMsg *rpcMsg) { mgmtSaveQhandle(pShow); pShowRsp->qhandle = htobe64((uint64_t) pShow); - code = (*tsMgmtShowMetaFp[(uint8_t) pShowMsg->type])(&pShowRsp->tableMeta, pShow, rpcMsg->handle); - if (code == 0) { - size = sizeof(SShowRsp) + sizeof(SSchema) * pShow->numOfColumns; + if (tsMgmtShowMetaFp[pShowMsg->type]) { + code = (*tsMgmtShowMetaFp[(uint8_t) pShowMsg->type])(&pShowRsp->tableMeta, pShow, rpcMsg->handle); + if (code == 0) { + size = sizeof(SShowRsp) + sizeof(SSchema) * pShow->numOfColumns; + } else { + mError("pShow:%p, type:%d %s, failed to get Meta, code:%d", pShow, pShowMsg->type, + taosMsg[(uint8_t) pShowMsg->type], code); + free(pShow); + } } else { - mError("pShow:%p, type:%d %s, failed to get Meta, code:%d", pShow, pShowMsg->type, - taosMsg[(uint8_t) pShowMsg->type], code); - free(pShow); + code = TSDB_CODE_OPS_NOT_SUPPORT; } } + rpcRsp.code = code; rpcRsp.pCont = pShowRsp; rpcRsp.contLen = size; rpcSendResponse(&rpcRsp); @@ -621,203 +264,50 @@ static void mgmtProcessRetrieveMsg(SRpcMsg *rpcMsg) { mgmtFreeQhandle(pShow); } } -// -//void mgmtProcessCreateTableMsg(SRpcMsg *rpcMsg) { -// SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; -// -// SCreateTableMsg *pCreate = (SCreateTableMsg *) rpcMsg->pCont; -// pCreate->numOfColumns = htons(pCreate->numOfColumns); -// pCreate->numOfTags = htons(pCreate->numOfTags); -// pCreate->sqlLen = htons(pCreate->sqlLen); -// -// SSchema *pSchema = (SSchema*) pCreate->schema; -// for (int32_t i = 0; i < pCreate->numOfColumns + pCreate->numOfTags; ++i) { -// pSchema->bytes = htons(pSchema->bytes); -// pSchema->colId = i; -// pSchema++; -// } -// -// if (mgmtCheckRedirect(rpcMsg->handle) != TSDB_CODE_SUCCESS) { -// mError("table:%s, failed to create table, need redirect message", pCreate->tableId); -// return; -// } -// -// SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); -// if (pUser == NULL) { -// mError("table:%s, failed to create table, invalid user", pCreate->tableId); -// rpcRsp.code = TSDB_CODE_INVALID_USER; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// if (!pUser->writeAuth) { -// mError("table:%s, failed to create table, no rights", pCreate->tableId); -// rpcRsp.code = TSDB_CODE_NO_RIGHTS; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// int32_t code = mgmtCreateTable(pCreate, rpcMsg->contLen, rpcMsg->handle, false); -// if (code != TSDB_CODE_ACTION_IN_PROGRESS) { -// rpcRsp.code = code; -// rpcSendResponse(&rpcRsp); -// } -//} -// -//void mgmtProcessDropTableMsg(SRpcMsg *rpcMsg) { -// SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; -// SDropTableMsg *pDrop = (SDropTableMsg *) rpcMsg->pCont; -// -// if (mgmtCheckRedirect(rpcMsg->handle) != TSDB_CODE_SUCCESS) { -// mError("table:%s, failed to drop table, need redirect message", pDrop->tableId); -// return; -// } -// -// SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); -// if (pUser == NULL) { -// mError("table:%s, failed to drop table, invalid user", pDrop->tableId); -// rpcRsp.code = TSDB_CODE_INVALID_USER; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// if (!pUser->writeAuth) { -// mError("table:%s, failed to drop table, no rights", pDrop->tableId); -// rpcRsp.code = TSDB_CODE_NO_RIGHTS; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// SDbObj *pDb = mgmtGetDbByTableId(pDrop->tableId); -// if (pDb == NULL) { -// mError("table:%s, failed to drop table, db not selected", pDrop->tableId); -// rpcRsp.code = TSDB_CODE_DB_NOT_SELECTED; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// int32_t code = mgmtDropTable(pDb, pDrop->tableId, pDrop->igNotExists); -// if (code != TSDB_CODE_ACTION_IN_PROGRESS) { -// rpcRsp.code = code; -// rpcSendResponse(&rpcRsp); -// } -//} -// -//void mgmtProcessAlterTableMsg(SRpcMsg *rpcMsg) { -// SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; -// if (mgmtCheckRedirect(rpcMsg->handle) != TSDB_CODE_SUCCESS) { -// return; -// } -// -// SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); -// if (pUser == NULL) { -// rpcRsp.code = TSDB_CODE_INVALID_USER; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// SAlterTableMsg *pAlter = (SAlterTableMsg *) rpcMsg->pCont; -// -// if (!pUser->writeAuth) { -// rpcRsp.code = TSDB_CODE_NO_RIGHTS; -// } else { -// pAlter->type = htons(pAlter->type); -// pAlter->numOfCols = htons(pAlter->numOfCols); -// -// if (pAlter->numOfCols > 2) { -// mError("table:%s error numOfCols:%d in alter table", pAlter->tableId, pAlter->numOfCols); -// rpcRsp.code = TSDB_CODE_APP_ERROR; -// } else { -// SDbObj *pDb = mgmtGetDb(pAlter->db); -// if (pDb) { -// for (int32_t i = 0; i < pAlter->numOfCols; ++i) { -// pAlter->schema[i].bytes = htons(pAlter->schema[i].bytes); -// } -// -// rpcRsp.code = mgmtAlterTable(pDb, pAlter); -// if (rpcRsp.code == 0) { -// mLPrint("table:%s is altered by %s", pAlter->tableId, pUser->user); -// } -// } else { -// rpcRsp.code = TSDB_CODE_DB_NOT_SELECTED; -// } -// } -// } -// -// rpcSendResponse(&rpcRsp); -//} -// -//void mgmtProcessCfgDnodeMsg(SRpcMsg *rpcMsg) { -// SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; -// if (mgmtCheckRedirect(rpcMsg->handle) != TSDB_CODE_SUCCESS) { -// return; -// } -// -// SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); -// if (pUser == NULL) { -// rpcRsp.code = TSDB_CODE_INVALID_USER; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// SCfgDnodeMsg *pCfg = (SCfgDnodeMsg *) rpcMsg->pCont; -// -// if (strcmp(pUser->pAcct->user, "root") != 0) { -// rpcRsp.code = TSDB_CODE_NO_RIGHTS; -// } else { -// rpcRsp.code = mgmtSendCfgDnodeMsg(rpcMsg->pCont); -// } -// -// if (rpcRsp.code == TSDB_CODE_SUCCESS) { -// mTrace("dnode:%s is configured by %s", pCfg->ip, pUser->user); -// } -// -// rpcSendResponse(&rpcRsp); -//} -// -//void mgmtProcessHeartBeatMsg(SRpcMsg *rpcMsg) { -// SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; -// SHeartBeatMsg *pHBMsg = (SHeartBeatMsg *) rpcMsg->pCont; -// mgmtSaveQueryStreamList(pHBMsg); -// -// SHeartBeatRsp *pHBRsp = (SHeartBeatRsp *) rpcMallocCont(sizeof(SHeartBeatRsp)); -// if (pHBRsp == NULL) { -// rpcRsp.code = TSDB_CODE_SERV_OUT_OF_MEMORY; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// SRpcConnInfo connInfo; -// rpcGetConnInfo(rpcMsg->handle, &connInfo); -// -// pHBRsp->ipList.inUse = 0; -// pHBRsp->ipList.port = htons(tsMgmtShellPort); -// pHBRsp->ipList.numOfIps = 0; -// if (pSdbPublicIpList != NULL && pSdbIpList != NULL) { -// pHBRsp->ipList.numOfIps = htons(pSdbPublicIpList->numOfIps); -// if (connInfo.serverIp == tsPublicIpInt) { -// for (int i = 0; i < pSdbPublicIpList->numOfIps; ++i) { -// pHBRsp->ipList.ip[i] = htonl(pSdbPublicIpList->ip[i]); -// } -// } else { -// for (int i = 0; i < pSdbIpList->numOfIps; ++i) { -// pHBRsp->ipList.ip[i] = htonl(pSdbIpList->ip[i]); -// } -// } -// } -// -// /* -// * TODO -// * Dispose kill stream or kill query message -// */ -// pHBRsp->queryId = 0; -// pHBRsp->streamId = 0; -// pHBRsp->killConnection = 0; -// -// rpcRsp.pCont = pHBRsp; -// rpcRsp.contLen = sizeof(SHeartBeatRsp); -// rpcSendResponse(&rpcRsp); -//} + +static void mgmtProcessHeartBeatMsg(SRpcMsg *rpcMsg) { + SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; + //SHeartBeatMsg *pHBMsg = (SHeartBeatMsg *) rpcMsg->pCont; + //mgmtSaveQueryStreamList(pHBMsg); + + SHeartBeatRsp *pHBRsp = (SHeartBeatRsp *) rpcMallocCont(sizeof(SHeartBeatRsp)); + if (pHBRsp == NULL) { + rpcRsp.code = TSDB_CODE_SERV_OUT_OF_MEMORY; + rpcSendResponse(&rpcRsp); + return; + } + + SRpcConnInfo connInfo; + rpcGetConnInfo(rpcMsg->handle, &connInfo); + + pHBRsp->ipList.inUse = 0; + pHBRsp->ipList.port = htons(tsMgmtShellPort); + pHBRsp->ipList.numOfIps = 0; + if (pSdbPublicIpList != NULL && pSdbIpList != NULL) { + pHBRsp->ipList.numOfIps = htons(pSdbPublicIpList->numOfIps); + if (connInfo.serverIp == tsPublicIpInt) { + for (int i = 0; i < pSdbPublicIpList->numOfIps; ++i) { + pHBRsp->ipList.ip[i] = htonl(pSdbPublicIpList->ip[i]); + } + } else { + for (int i = 0; i < pSdbIpList->numOfIps; ++i) { + pHBRsp->ipList.ip[i] = htonl(pSdbIpList->ip[i]); + } + } + } + + /* + * TODO + * Dispose kill stream or kill query message + */ + pHBRsp->queryId = 0; + pHBRsp->streamId = 0; + pHBRsp->killConnection = 0; + + rpcRsp.pCont = pHBRsp; + rpcRsp.contLen = sizeof(SHeartBeatRsp); + rpcSendResponse(&rpcRsp); +} static int mgmtShellRetriveAuth(char *user, char *spi, char *encrypt, char *secret, char *ckey) { *spi = 0; @@ -834,509 +324,119 @@ static int mgmtShellRetriveAuth(char *user, char *spi, char *encrypt, char *secr } } -//static void mgmtProcessConnectMsg(SRpcMsg *rpcMsg) { -// SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; -// SConnectMsg *pConnectMsg = (SConnectMsg *) rpcMsg->pCont; -// -// SRpcConnInfo connInfo; -// rpcGetConnInfo(rpcMsg->handle, &connInfo); -// int32_t code; -// -// SUserObj *pUser = mgmtGetUser(connInfo.user); -// if (pUser == NULL) { -// code = TSDB_CODE_INVALID_USER; -// goto connect_over; -// } -// -// if (mgmtCheckExpired()) { -// code = TSDB_CODE_GRANT_EXPIRED; -// goto connect_over; -// } -// -// SAcctObj *pAcct = mgmtGetAcct(pUser->acct); -// if (pAcct == NULL) { -// code = TSDB_CODE_INVALID_ACCT; -// goto connect_over; -// } -// -// code = taosCheckVersion(pConnectMsg->clientVersion, version, 3); -// if (code != TSDB_CODE_SUCCESS) { -// goto connect_over; -// } -// -// if (pConnectMsg->db[0]) { -// char dbName[TSDB_TABLE_ID_LEN] = {0}; -// sprintf(dbName, "%x%s%s", pAcct->acctId, TS_PATH_DELIMITER, pConnectMsg->db); -// SDbObj *pDb = mgmtGetDb(dbName); -// if (pDb == NULL) { -// code = TSDB_CODE_INVALID_DB; -// goto connect_over; -// } -// } -// -// SConnectRsp *pConnectRsp = rpcMallocCont(sizeof(SConnectRsp)); -// if (pConnectRsp == NULL) { -// code = TSDB_CODE_SERV_OUT_OF_MEMORY; -// goto connect_over; -// } -// -// sprintf(pConnectRsp->acctId, "%x", pAcct->acctId); -// strcpy(pConnectRsp->serverVersion, version); -// pConnectRsp->writeAuth = pUser->writeAuth; -// pConnectRsp->superAuth = pUser->superAuth; -// pConnectRsp->ipList.inUse = 0; -// pConnectRsp->ipList.port = htons(tsMgmtShellPort); -// pConnectRsp->ipList.numOfIps = 0; -// if (pSdbPublicIpList != NULL && pSdbIpList != NULL) { -// pConnectRsp->ipList.numOfIps = htons(pSdbPublicIpList->numOfIps); -// if (connInfo.serverIp == tsPublicIpInt) { -// for (int i = 0; i < pSdbPublicIpList->numOfIps; ++i) { -// pConnectRsp->ipList.ip[i] = htonl(pSdbPublicIpList->ip[i]); -// } -// } else { -// for (int i = 0; i < pSdbIpList->numOfIps; ++i) { -// pConnectRsp->ipList.ip[i] = htonl(pSdbIpList->ip[i]); -// } -// } -// } -// -//connect_over: -// rpcRsp.code = code; -// if (code != TSDB_CODE_SUCCESS) { -// mLError("user:%s login from %s, code:%d", connInfo.user, taosIpStr(connInfo.clientIp), code); -// } else { -// mLPrint("user:%s login from %s, code:%d", connInfo.user, taosIpStr(connInfo.clientIp), code); -// rpcRsp.pCont = pConnectRsp; -// rpcRsp.contLen = sizeof(SConnectRsp); -// } -// rpcSendResponse(&rpcRsp); -//} -// -///** -// * check if we need to add mgmtProcessTableMetaMsg into tranQueue, which will be executed one-by-one. -// */ -//static bool mgmtCheckMeterMetaMsgType(void *pMsg) { -// STableInfoMsg *pInfo = (STableInfoMsg *) pMsg; -// int16_t autoCreate = htons(pInfo->createFlag); -// STableInfo *pTable = mgmtGetTable(pInfo->tableId); -// -// // If table does not exists and autoCreate flag is set, we add the handler into task queue -// bool addIntoTranQueue = (pTable == NULL && autoCreate == 1); -// if (addIntoTranQueue) { -// mTrace("table:%s auto created task added", pInfo->tableId); -// } -// -// return addIntoTranQueue; -//} -// -//static bool mgmtCheckMsgReadOnly(int8_t type, void *pCont) { -// if ((type == TSDB_MSG_TYPE_TABLE_META && (!mgmtCheckMeterMetaMsgType(pCont))) || -// type == TSDB_MSG_TYPE_STABLE_META || type == TSDB_MSG_TYPE_RETRIEVE || -// type == TSDB_MSG_TYPE_SHOW || type == TSDB_MSG_TYPE_MULTI_TABLE_META || -// type == TSDB_MSG_TYPE_CONNECT) { -// return true; -// } -// -// return false; -//} -// -//static void mgmtProcessMsgFromShell(SRpcMsg *rpcMsg) { -// if (sdbGetRunStatus() != SDB_STATUS_SERVING) { -// mTrace("shell msg is ignored since SDB is not ready"); -// SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = TSDB_CODE_NOT_READY, .msgType = 0}; -// rpcSendResponse(&rpcRsp); -// rpcFreeCont(rpcMsg->pCont); -// return; -// } -// -// if (mgmtCheckMsgReadOnly(rpcMsg->msgType, rpcMsg->pCont)) { -// (*mgmtProcessShellMsg[rpcMsg->msgType])(rpcMsg); -// } else { -// if (mgmtProcessShellMsg[rpcMsg->msgType]) { -// mgmtAddToTranRequest(rpcMsg); -// } else { -// mError("%s from shell is not processed", taosMsg[rpcMsg->msgType]); -// } -// } -// -// rpcFreeCont(rpcMsg->pCont); -//} -// -//void mgmtProcessCreateVgroup(SCreateTableMsg *pCreate, int32_t contLen, void *thandle, bool isGetMeta) { -// SRpcMsg rpcRsp = {.handle = thandle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; -// SDbObj *pDb = mgmtGetDb(pCreate->db); -// if (pDb == NULL) { -// mError("table:%s, failed to create vgroup, db not found", pCreate->tableId); -// rpcRsp.code = TSDB_CODE_INVALID_DB; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// SVgObj *pVgroup = mgmtCreateVgroup(pDb); -// if (pVgroup == NULL) { -// mError("table:%s, failed to alloc vnode to vgroup", pCreate->tableId); -// rpcRsp.code = TSDB_CODE_NO_ENOUGH_DNODES; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// void *cont = rpcMallocCont(contLen); -// if (cont == NULL) { -// mError("table:%s, failed to create table, can not alloc memory", pCreate->tableId); -// rpcRsp.code = TSDB_CODE_SERV_OUT_OF_MEMORY; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// memcpy(cont, pCreate, contLen); -// -// SProcessInfo *info = calloc(1, sizeof(SProcessInfo)); -// info->type = TSDB_PROCESS_CREATE_VGROUP; -// info->thandle = thandle; -// info->ahandle = pVgroup; -// info->cont = cont; -// info->contLen = contLen; -// -// if (isGetMeta) { -// info->type = TSDB_PROCESS_CREATE_VGROUP_GET_META; -// } -// -// mgmtSendCreateVgroupMsg(pVgroup, info); -//} -// -//void mgmtProcessCreateTable(SVgObj *pVgroup, SCreateTableMsg *pCreate, int32_t contLen, void *thandle, bool isGetMeta) { -// assert(pVgroup != NULL); -// SRpcMsg rpcRsp = {.handle = thandle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; -// -// int32_t sid = taosAllocateId(pVgroup->idPool); -// if (sid < 0) { -// mTrace("table:%s, no enough sid in vgroup:%d, start to create a new vgroup", pCreate->tableId, pVgroup->vgId); -// mgmtProcessCreateVgroup(pCreate, contLen, thandle, isGetMeta); -// return; -// } -// -// STableInfo *pTable; -// SDMCreateTableMsg *pDCreate = NULL; -// -// if (pCreate->numOfColumns == 0) { -// mTrace("table:%s, start to create child table, vgroup:%d sid:%d", pCreate->tableId, pVgroup->vgId, sid); -// rpcRsp.code = mgmtCreateChildTable(pCreate, contLen, pVgroup, sid, &pDCreate, &pTable); -// } else { -// mTrace("table:%s, start to create normal table, vgroup:%d sid:%d", pCreate->tableId, pVgroup->vgId, sid); -// rpcRsp.code = mgmtCreateNormalTable(pCreate, contLen, pVgroup, sid, &pDCreate, &pTable); -// } -// -// if (rpcRsp.code != TSDB_CODE_SUCCESS) { -// mTrace("table:%s, failed to create table in vgroup:%d sid:%d ", pCreate->tableId, pVgroup->vgId, sid); -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// assert(pDCreate != NULL); -// assert(pTable != NULL); -// -// SProcessInfo *info = calloc(1, sizeof(SProcessInfo)); -// info->type = TSDB_PROCESS_CREATE_TABLE; -// info->thandle = thandle; -// info->ahandle = pTable; -// SRpcIpSet ipSet = mgmtGetIpSetFromVgroup(pVgroup); -// if (isGetMeta) { -// info->type = TSDB_PROCESS_CREATE_TABLE_GET_META; -// } -// -// mgmtSendCreateTableMsg(pDCreate, &ipSet, info); -//} -// -//void mgmtProcessGetTableMeta(STableInfo *pTable, void *thandle) { -// SRpcMsg rpcRsp = {.handle = thandle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; -// SDbObj* pDb = mgmtGetDbByTableId(pTable->tableId); -// if (pDb == NULL || pDb->dropStatus != TSDB_DB_STATUS_READY) { -// mError("table:%s, failed to get table meta, db not selected", pTable->tableId); -// rpcRsp.code = TSDB_CODE_DB_NOT_SELECTED; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// SRpcConnInfo connInfo; -// rpcGetConnInfo(thandle, &connInfo); -// bool usePublicIp = (connInfo.serverIp == tsPublicIpInt); -// -// STableMeta *pMeta = rpcMallocCont(sizeof(STableMeta) + sizeof(SSchema) * TSDB_MAX_COLUMNS); -// rpcRsp.code = mgmtGetTableMeta(pDb, pTable, pMeta, usePublicIp); -// -// if (rpcRsp.code != TSDB_CODE_SUCCESS) { -// rpcFreeCont(pMeta); -// } else { -// pMeta->contLen = htons(pMeta->contLen); -// rpcRsp.pCont = pMeta; -// rpcRsp.contLen = pMeta->contLen; -// } -// -// rpcSendResponse(&rpcRsp); -//} -// -//static int32_t mgmtCheckRedirectMsgImp(void *pConn) { -// return 0; -//} -// -//int32_t (*mgmtCheckRedirect)(void *pConn) = mgmtCheckRedirectMsgImp; -// -//static void mgmtProcessUnSupportMsg(SRpcMsg *rpcMsg) { -// SRpcMsg rpcRsp = { -// .msgType = 0, -// .pCont = 0, -// .contLen = 0, -// .code = TSDB_CODE_OPS_NOT_SUPPORT, -// .handle = rpcMsg->handle -// }; -// rpcSendResponse(&rpcRsp); -//} -// -//static void mgmtProcessAlterAcctMsg(SRpcMsg *rpcMsg) { -// SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; -// if (!mgmtAlterAcctFp) { -// rpcRsp.code = TSDB_CODE_OPS_NOT_SUPPORT; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// SAlterAcctMsg *pAlter = rpcMsg->pCont; -// pAlter->cfg.maxUsers = htonl(pAlter->cfg.maxUsers); -// pAlter->cfg.maxDbs = htonl(pAlter->cfg.maxDbs); -// pAlter->cfg.maxTimeSeries = htonl(pAlter->cfg.maxTimeSeries); -// pAlter->cfg.maxConnections = htonl(pAlter->cfg.maxConnections); -// pAlter->cfg.maxStreams = htonl(pAlter->cfg.maxStreams); -// pAlter->cfg.maxPointsPerSecond = htonl(pAlter->cfg.maxPointsPerSecond); -// pAlter->cfg.maxStorage = htobe64(pAlter->cfg.maxStorage); -// pAlter->cfg.maxQueryTime = htobe64(pAlter->cfg.maxQueryTime); -// pAlter->cfg.maxInbound = htobe64(pAlter->cfg.maxInbound); -// pAlter->cfg.maxOutbound = htobe64(pAlter->cfg.maxOutbound); -// -// if (mgmtCheckRedirect(rpcMsg->handle) != TSDB_CODE_SUCCESS) { -// mError("account:%s, failed to alter account, need redirect message", pAlter->user); -// return; -// } -// -// SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); -// if (pUser == NULL) { -// mError("account:%s, failed to alter account, invalid user", pAlter->user); -// rpcRsp.code = TSDB_CODE_INVALID_USER; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// if (strcmp(pUser->user, "root") != 0) { -// mError("account:%s, failed to alter account, no rights", pAlter->user); -// rpcRsp.code = TSDB_CODE_NO_RIGHTS; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// int32_t code = mgmtAlterAcctFp(pAlter->user, pAlter->pass, &(pAlter->cfg));; -// if (code == TSDB_CODE_SUCCESS) { -// mLPrint("account:%s is altered by %s", pAlter->user, pUser->user); -// } else { -// mError("account:%s, failed to alter account, reason:%s", pAlter->user, tstrerror(code)); -// } -// -// rpcRsp.code = code; -// rpcSendResponse(&rpcRsp); -//} -// -//static void mgmtProcessDropAcctMsg(SRpcMsg *rpcMsg) { -// SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; -// if (!mgmtDropAcctFp) { -// rpcRsp.code = TSDB_CODE_OPS_NOT_SUPPORT; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// SDropAcctMsg *pDrop = (SDropAcctMsg *) rpcMsg->pCont; -// if (mgmtCheckRedirect(rpcMsg->handle) != TSDB_CODE_SUCCESS) { -// mError("account:%s, failed to drop account, need redirect message", pDrop->user); -// return; -// } -// -// SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); -// if (pUser == NULL) { -// mError("account:%s, failed to drop account, invalid user", pDrop->user); -// rpcRsp.code = TSDB_CODE_INVALID_USER; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// if (strcmp(pUser->user, "root") != 0) { -// mError("account:%s, failed to drop account, no rights", pDrop->user); -// rpcRsp.code = TSDB_CODE_NO_RIGHTS; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// int32_t code = mgmtDropAcctFp(pDrop->user); -// if (code == TSDB_CODE_SUCCESS) { -// mLPrint("account:%s is dropped by %s", pDrop->user, pUser->user); -// } else { -// mError("account:%s, failed to drop account, reason:%s", pDrop->user, tstrerror(code)); -// } -// -// rpcRsp.code = code; -// rpcSendResponse(&rpcRsp); -//} -// -//static void mgmtProcessCreateAcctMsg(SRpcMsg *rpcMsg) { -// SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; -// if (!mgmtCreateAcctFp) { -// rpcRsp.code = TSDB_CODE_OPS_NOT_SUPPORT; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// SCreateAcctMsg *pCreate = (SCreateAcctMsg *) rpcMsg->pCont; -// pCreate->cfg.maxUsers = htonl(pCreate->cfg.maxUsers); -// pCreate->cfg.maxDbs = htonl(pCreate->cfg.maxDbs); -// pCreate->cfg.maxTimeSeries = htonl(pCreate->cfg.maxTimeSeries); -// pCreate->cfg.maxConnections = htonl(pCreate->cfg.maxConnections); -// pCreate->cfg.maxStreams = htonl(pCreate->cfg.maxStreams); -// pCreate->cfg.maxPointsPerSecond = htonl(pCreate->cfg.maxPointsPerSecond); -// pCreate->cfg.maxStorage = htobe64(pCreate->cfg.maxStorage); -// pCreate->cfg.maxQueryTime = htobe64(pCreate->cfg.maxQueryTime); -// pCreate->cfg.maxInbound = htobe64(pCreate->cfg.maxInbound); -// pCreate->cfg.maxOutbound = htobe64(pCreate->cfg.maxOutbound); -// -// if (mgmtCheckRedirect(rpcMsg->handle) != TSDB_CODE_SUCCESS) { -// mError("account:%s, failed to create account, need redirect message", pCreate->user); -// return; -// } -// -// SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); -// if (pUser == NULL) { -// mError("account:%s, failed to create account, invalid user", pCreate->user); -// rpcRsp.code = TSDB_CODE_INVALID_USER; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// if (strcmp(pUser->user, "root") != 0) { -// mError("account:%s, failed to create account, no rights", pCreate->user); -// rpcRsp.code = TSDB_CODE_NO_RIGHTS; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// int32_t code = mgmtCreateAcctFp(pCreate->user, pCreate->pass, &(pCreate->cfg)); -// if (code == TSDB_CODE_SUCCESS) { -// mLPrint("account:%s is created by %s", pCreate->user, pUser->user); -// } else { -// mError("account:%s, failed to create account, reason:%s", pCreate->user, tstrerror(code)); -// } -// -// rpcRsp.code = code; -// rpcSendResponse(&rpcRsp); -//} -// -//static void mgmtProcessCreateDnodeMsg(SRpcMsg *rpcMsg) { -// SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; -// if (!mgmtCreateDnodeFp) { -// rpcRsp.code = TSDB_CODE_OPS_NOT_SUPPORT; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// SCreateDnodeMsg *pCreate = (SCreateDnodeMsg *) rpcMsg->pCont; -// if (mgmtCheckRedirect(rpcMsg->handle) != TSDB_CODE_SUCCESS) { -// mError("failed to create dnode:%s, redirect this message", pCreate->ip); -// return; -// } -// -// SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); -// if (pUser == NULL) { -// mError("failed to create dnode:%s, reason:%s", pCreate->ip, tstrerror(TSDB_CODE_INVALID_USER)); -// rpcRsp.code = TSDB_CODE_INVALID_USER; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// if (strcmp(pUser->user, "root") != 0) { -// mError("failed to create dnode:%s, reason:%s", pCreate->ip, tstrerror(TSDB_CODE_NO_RIGHTS)); -// rpcRsp.code = TSDB_CODE_NO_RIGHTS; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// int32_t code = (*mgmtCreateDnodeFp)(inet_addr(pCreate->ip)); -// if (code == TSDB_CODE_SUCCESS) { -// mLPrint("dnode:%s is created by %s", pCreate->ip, pUser->user); -// } else { -// mError("failed to create dnode:%s, reason:%s", pCreate->ip, tstrerror(code)); -// } -// -// rpcRsp.code = code; -// rpcSendResponse(&rpcRsp); -//} -// -//static void mgmtProcessDropDnodeMsg(SRpcMsg *rpcMsg) { -// SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; -// if (!mgmtDropDnodeByIpFp) { -// rpcRsp.code = TSDB_CODE_OPS_NOT_SUPPORT; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// SDropDnodeMsg *pDrop = (SDropDnodeMsg *) rpcMsg->pCont; -// if (mgmtCheckRedirect(rpcMsg->handle) != TSDB_CODE_SUCCESS) { -// mError("failed to drop dnode:%s, redirect this message", pDrop->ip); -// return; -// } -// -// SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); -// if (pUser == NULL) { -// mError("failed to drop dnode:%s, reason:%s", pDrop->ip, tstrerror(TSDB_CODE_INVALID_USER)); -// rpcRsp.code = TSDB_CODE_INVALID_USER; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// if (strcmp(pUser->user, "root") != 0) { -// mError("failed to drop dnode:%s, reason:%s", pDrop->ip, tstrerror(TSDB_CODE_NO_RIGHTS)); -// rpcRsp.code = TSDB_CODE_NO_RIGHTS; -// rpcSendResponse(&rpcRsp); -// return; -// } -// -// int32_t code = (*mgmtDropDnodeByIpFp)(inet_addr(pDrop->ip)); -// if (code == TSDB_CODE_SUCCESS) { -// mLPrint("dnode:%s set to removing state by %s", pDrop->ip, pUser->user); -// } else { -// mError("failed to drop dnode:%s, reason:%s", pDrop->ip, tstrerror(code)); -// } -// -// rpcRsp.code = code; -// rpcSendResponse(&rpcRsp); -//} -// -//void mgmtInitProcessShellMsg() { -// mgmtProcessShellMsg[TSDB_MSG_TYPE_CONNECT] = mgmtProcessConnectMsg; -// mgmtProcessShellMsg[TSDB_MSG_TYPE_HEARTBEAT] = mgmtProcessHeartBeatMsg; -// mgmtProcessShellMsg[TSDB_MSG_TYPE_CREATE_DB] = mgmtProcessCreateDbMsg; -// mgmtProcessShellMsg[TSDB_MSG_TYPE_ALTER_DB] = mgmtProcessAlterDbMsg; -// mgmtProcessShellMsg[TSDB_MSG_TYPE_DROP_DB] = mgmtProcessDropDbMsg; -// mgmtProcessShellMsg[TSDB_MSG_TYPE_USE_DB] = mgmtProcessUnSupportMsg; -// mgmtProcessShellMsg[TSDB_MSG_TYPE_CREATE_ACCT] = mgmtProcessCreateAcctMsg; -// mgmtProcessShellMsg[TSDB_MSG_TYPE_DROP_ACCT] = mgmtProcessDropAcctMsg; -// mgmtProcessShellMsg[TSDB_MSG_TYPE_ALTER_ACCT] = mgmtProcessAlterAcctMsg; -// mgmtProcessShellMsg[TSDB_MSG_TYPE_CREATE_TABLE] = mgmtProcessCreateTableMsg; -// mgmtProcessShellMsg[TSDB_MSG_TYPE_DROP_TABLE] = mgmtProcessDropTableMsg; -// mgmtProcessShellMsg[TSDB_MSG_TYPE_ALTER_TABLE] = mgmtProcessAlterTableMsg; -// mgmtProcessShellMsg[TSDB_MSG_TYPE_CREATE_DNODE] = mgmtProcessCreateDnodeMsg; -// mgmtProcessShellMsg[TSDB_MSG_TYPE_DROP_DNODE] = mgmtProcessDropDnodeMsg; -// mgmtProcessShellMsg[TSDB_MSG_TYPE_MD_CONFIG_DNODE] = mgmtProcessCfgDnodeMsg; -// mgmtProcessShellMsg[TSDB_MSG_TYPE_CREATE_MNODE] = mgmtProcessUnSupportMsg; -// mgmtProcessShellMsg[TSDB_MSG_TYPE_DROP_MNODE] = mgmtProcessUnSupportMsg; -// mgmtProcessShellMsg[TSDB_MSG_TYPE_CFG_MNODE] = mgmtProcessUnSupportMsg; -// mgmtProcessShellMsg[TSDB_MSG_TYPE_KILL_QUERY] = mgmtProcessKillQueryMsg; -// mgmtProcessShellMsg[TSDB_MSG_TYPE_KILL_STREAM] = mgmtProcessKillStreamMsg; -// mgmtProcessShellMsg[TSDB_MSG_TYPE_KILL_CONNECTION] = mgmtProcessKillConnectionMsg; -// mgmtProcessShellMsg[TSDB_MSG_TYPE_TABLE_META] = mgmtProcessTableMetaMsg; -// mgmtProcessShellMsg[TSDB_MSG_TYPE_MULTI_TABLE_META] = mgmtProcessMultiTableMetaMsg; -// mgmtProcessShellMsg[TSDB_MSG_TYPE_STABLE_META] = mgmtProcessSuperTableMetaMsg; -//} +static void mgmtProcessConnectMsg(SRpcMsg *rpcMsg) { + SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; + SConnectMsg *pConnectMsg = (SConnectMsg *) rpcMsg->pCont; + + SRpcConnInfo connInfo; + rpcGetConnInfo(rpcMsg->handle, &connInfo); + int32_t code; + + SUserObj *pUser = mgmtGetUser(connInfo.user); + if (pUser == NULL) { + code = TSDB_CODE_INVALID_USER; + goto connect_over; + } + + if (mgmtCheckExpired()) { + code = TSDB_CODE_GRANT_EXPIRED; + goto connect_over; + } + + SAcctObj *pAcct = mgmtGetAcct(pUser->acct); + if (pAcct == NULL) { + code = TSDB_CODE_INVALID_ACCT; + goto connect_over; + } + + code = taosCheckVersion(pConnectMsg->clientVersion, version, 3); + if (code != TSDB_CODE_SUCCESS) { + goto connect_over; + } + + if (pConnectMsg->db[0]) { + char dbName[TSDB_TABLE_ID_LEN] = {0}; + sprintf(dbName, "%x%s%s", pAcct->acctId, TS_PATH_DELIMITER, pConnectMsg->db); + SDbObj *pDb = mgmtGetDb(dbName); + if (pDb == NULL) { + code = TSDB_CODE_INVALID_DB; + goto connect_over; + } + } + + SConnectRsp *pConnectRsp = rpcMallocCont(sizeof(SConnectRsp)); + if (pConnectRsp == NULL) { + code = TSDB_CODE_SERV_OUT_OF_MEMORY; + goto connect_over; + } + + sprintf(pConnectRsp->acctId, "%x", pAcct->acctId); + strcpy(pConnectRsp->serverVersion, version); + pConnectRsp->writeAuth = pUser->writeAuth; + pConnectRsp->superAuth = pUser->superAuth; + pConnectRsp->ipList.inUse = 0; + pConnectRsp->ipList.port = htons(tsMgmtShellPort); + pConnectRsp->ipList.numOfIps = 0; + if (pSdbPublicIpList != NULL && pSdbIpList != NULL) { + pConnectRsp->ipList.numOfIps = htons(pSdbPublicIpList->numOfIps); + if (connInfo.serverIp == tsPublicIpInt) { + for (int i = 0; i < pSdbPublicIpList->numOfIps; ++i) { + pConnectRsp->ipList.ip[i] = htonl(pSdbPublicIpList->ip[i]); + } + } else { + for (int i = 0; i < pSdbIpList->numOfIps; ++i) { + pConnectRsp->ipList.ip[i] = htonl(pSdbIpList->ip[i]); + } + } + } + +connect_over: + rpcRsp.code = code; + if (code != TSDB_CODE_SUCCESS) { + mLError("user:%s login from %s, code:%d", connInfo.user, taosIpStr(connInfo.clientIp), code); + } else { + mLPrint("user:%s login from %s, code:%d", connInfo.user, taosIpStr(connInfo.clientIp), code); + rpcRsp.pCont = pConnectRsp; + rpcRsp.contLen = sizeof(SConnectRsp); + } + rpcSendResponse(&rpcRsp); +} + +/** + * check if we need to add mgmtProcessTableMetaMsg into tranQueue, which will be executed one-by-one. + */ +static bool mgmtCheckMeterMetaMsgType(void *pMsg) { + STableInfoMsg *pInfo = (STableInfoMsg *) pMsg; + int16_t autoCreate = htons(pInfo->createFlag); + STableInfo *pTable = mgmtGetTable(pInfo->tableId); + + // If table does not exists and autoCreate flag is set, we add the handler into task queue + bool addIntoTranQueue = (pTable == NULL && autoCreate == 1); + if (addIntoTranQueue) { + mTrace("table:%s auto created task added", pInfo->tableId); + } + + return addIntoTranQueue; +} + +static bool mgmtCheckMsgReadOnly(int8_t type, void *pCont) { + if ((type == TSDB_MSG_TYPE_TABLE_META && (!mgmtCheckMeterMetaMsgType(pCont))) || + type == TSDB_MSG_TYPE_STABLE_META || type == TSDB_MSG_TYPE_RETRIEVE || + type == TSDB_MSG_TYPE_SHOW || type == TSDB_MSG_TYPE_MULTI_TABLE_META || + type == TSDB_MSG_TYPE_CONNECT) { + return true; + } + + return false; +} + +static void mgmtProcessUnSupportMsg(SRpcMsg *rpcMsg) { + SRpcMsg rpcRsp = { + .msgType = 0, + .pCont = 0, + .contLen = 0, + .code = TSDB_CODE_OPS_NOT_SUPPORT, + .handle = rpcMsg->handle + }; + rpcSendResponse(&rpcRsp); +} diff --git a/src/mnode/src/mgmtSuperTable.c b/src/mnode/src/mgmtSuperTable.c index ddef464088da527f1518d63cb32b48f9e33a5e23..1d7db53a5e71191068f77437f4c4039b034f6618 100644 --- a/src/mnode/src/mgmtSuperTable.c +++ b/src/mnode/src/mgmtSuperTable.c @@ -29,6 +29,7 @@ #include "mgmtDb.h" #include "mgmtDnode.h" #include "mgmtGrant.h" +#include "mgmtShell.h" #include "mgmtSuperTable.h" #include "mgmtTable.h" #include "mgmtUser.h" @@ -45,6 +46,8 @@ static void *mgmtSuperTableActionEncode(void *row, char *str, int32_t size, int3 static void *mgmtSuperTableActionDecode(void *row, char *str, int32_t size, int32_t *ssize); static void *mgmtSuperTableActionReset(void *row, char *str, int32_t size, int32_t *ssize); static void *mgmtSuperTableActionDestroy(void *row, char *str, int32_t size, int32_t *ssize); +static int32_t mgmtRetrieveShowSuperTables(SShowObj *pShow, char *data, int32_t rows, void *pConn); +static int32_t mgmtGetShowSuperTableMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn); static void mgmtDestroySuperTable(SSuperTableObj *pTable) { free(pTable->schema); @@ -186,6 +189,9 @@ int32_t mgmtInitSuperTables() { mgmtAddSuperTableIntoDb(pDb); } + mgmtAddShellShowMetaHandle(TSDB_MGMT_TABLE_METRIC, mgmtGetShowSuperTableMeta); + mgmtAddShellShowRetrieveHandle(TSDB_MGMT_TABLE_METRIC, mgmtRetrieveShowSuperTables); + mTrace("stables is initialized"); return 0; } @@ -477,7 +483,7 @@ int32_t mgmtDropSuperTableColumnByName(SSuperTableObj *pStable, char *colName) { return TSDB_CODE_SUCCESS; } -int32_t mgmtGetShowSuperTableMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) { +static int32_t mgmtGetShowSuperTableMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) { SDbObj *pDb = mgmtGetDb(pShow->db); if (pDb == NULL) { return TSDB_CODE_DB_NOT_SELECTED; diff --git a/src/mnode/src/mgmtSystem.c b/src/mnode/src/mgmtSystem.c index 5265c3bcda793fb83e5e799a3a6e985a2edda602..96e0abcb700b9d1cb529ee91093b7fb68b9d5aee 100644 --- a/src/mnode/src/mgmtSystem.c +++ b/src/mnode/src/mgmtSystem.c @@ -22,7 +22,9 @@ #include "mgmtAcct.h" #include "mgmtBalance.h" #include "mgmtDb.h" +#include "mgmtDClient.h" #include "mgmtDnode.h" +#include "mgmtDServer.h" #include "mgmtVgroup.h" #include "mgmtUser.h" #include "mgmtSystem.h" @@ -39,9 +41,10 @@ void mgmtCleanUpSystem() { sdbCleanUpPeers(); mgmtCleanupBalance(); - mgmtCleanUpDnodeInt(); + mgmtCleanupDClient(); + mgmtCleanupDServer(); mgmtCleanUpShell(); - mgmtCleanUpMeters(); + mgmtCleanUpTables(); mgmtCleanUpVgroups(); mgmtCleanUpDbs(); mgmtCleanUpDnodes(); @@ -114,15 +117,18 @@ int32_t mgmtStartSystem() { return -1; } - if (mgmtInitDnodeInt() < 0) { - mError("failed to init inter-mgmt communication"); + if (mgmtInitDClient() < 0) { return -1; } -// if (mgmtInitShell() < 0) { -// mError("failed to init shell"); -// return -1; -// } + if (mgmtInitDServer() < 0) { + return -1; + } + + if (mgmtInitShell() < 0) { + mError("failed to init shell"); + return -1; + } if (sdbInitPeers(tsMgmtDirectory) < 0) { mError("failed to init peers"); diff --git a/src/mnode/src/mgmtTable.c b/src/mnode/src/mgmtTable.c index 59f313bf5441504bacf686b034f694c3a73c7002..c4bbd9b3f2c415b5f87824333bc92e042125669a 100644 --- a/src/mnode/src/mgmtTable.c +++ b/src/mnode/src/mgmtTable.c @@ -29,8 +29,10 @@ #include "mgmtAcct.h" #include "mgmtChildTable.h" #include "mgmtDb.h" +#include "mgmtDClient.h" #include "mgmtDnode.h" #include "mgmtGrant.h" +#include "mgmtMnode.h" #include "mgmtNormalTable.h" #include "mgmtProfile.h" #include "mgmtShell.h" @@ -42,6 +44,15 @@ extern void *tsNormalTableSdb; extern void *tsChildTableSdb; +static void mgmtProcessCreateTableMsg(SRpcMsg *rpcMsg); +static void mgmtProcessDropTableMsg(SRpcMsg *rpcMsg); +static void mgmtProcessAlterTableMsg(SRpcMsg *rpcMsg); +static void mgmtProcessTableMetaMsg(SRpcMsg *rpcMsg); +static void mgmtProcessMultiTableMetaMsg(SRpcMsg *rpcMsg); +static void mgmtProcessSuperTableMetaMsg(SRpcMsg *rpcMsg); +static int32_t mgmtGetShowTableMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn); +static int32_t mgmtRetrieveShowTables(SShowObj *pShow, char *data, int32_t rows, void *pConn); + int32_t mgmtInitTables() { int32_t code = mgmtInitSuperTables(); if (code != TSDB_CODE_SUCCESS) { @@ -60,6 +71,15 @@ int32_t mgmtInitTables() { mgmtSetVgroupIdPool(); + mgmtAddShellMsgHandle(TSDB_MSG_TYPE_CREATE_TABLE, mgmtProcessCreateTableMsg); + mgmtAddShellMsgHandle(TSDB_MSG_TYPE_DROP_TABLE, mgmtProcessDropTableMsg); + mgmtAddShellMsgHandle(TSDB_MSG_TYPE_ALTER_TABLE, mgmtProcessAlterTableMsg); + mgmtAddShellMsgHandle(TSDB_MSG_TYPE_TABLE_META, mgmtProcessTableMetaMsg); + mgmtAddShellMsgHandle(TSDB_MSG_TYPE_MULTI_TABLE_META, mgmtProcessMultiTableMetaMsg); + mgmtAddShellMsgHandle(TSDB_MSG_TYPE_STABLE_META, mgmtProcessSuperTableMetaMsg); + mgmtAddShellShowMetaHandle(TSDB_MGMT_TABLE_TABLE, mgmtGetShowTableMeta); + mgmtAddShellShowRetrieveHandle(TSDB_MGMT_TABLE_TABLE, mgmtRetrieveShowTables); + return TSDB_CODE_SUCCESS; } @@ -111,6 +131,114 @@ int32_t mgmtGetTableMeta(SDbObj *pDb, STableInfo *pTable, STableMeta *pMeta, boo return TSDB_CODE_SUCCESS; } + + +void mgmtProcessCreateVgroup(SCreateTableMsg *pCreate, int32_t contLen, void *thandle, bool isGetMeta) { + SRpcMsg rpcRsp = {.handle = thandle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; + SDbObj *pDb = mgmtGetDb(pCreate->db); + if (pDb == NULL) { + mError("table:%s, failed to create vgroup, db not found", pCreate->tableId); + rpcRsp.code = TSDB_CODE_INVALID_DB; + rpcSendResponse(&rpcRsp); + return; + } + + SVgObj *pVgroup = mgmtCreateVgroup(pDb); + if (pVgroup == NULL) { + mError("table:%s, failed to alloc vnode to vgroup", pCreate->tableId); + rpcRsp.code = TSDB_CODE_NO_ENOUGH_DNODES; + rpcSendResponse(&rpcRsp); + return; + } + + void *cont = rpcMallocCont(contLen); + if (cont == NULL) { + mError("table:%s, failed to create table, can not alloc memory", pCreate->tableId); + rpcRsp.code = TSDB_CODE_SERV_OUT_OF_MEMORY; + rpcSendResponse(&rpcRsp); + return; + } + + memcpy(cont, pCreate, contLen); + + SProcessInfo *info = calloc(1, sizeof(SProcessInfo)); + info->type = TSDB_PROCESS_CREATE_VGROUP; + info->thandle = thandle; + info->ahandle = pVgroup; + info->cont = cont; + info->contLen = contLen; + + if (isGetMeta) { + info->type = TSDB_PROCESS_CREATE_VGROUP_GET_META; + } + + mgmtSendCreateVgroupMsg(pVgroup, info); +} + +//void mgmtSendCreateTableMsg(SDMCreateTableMsg *pCreate, SRpcIpSet *ipSet, void *ahandle) { +// mTrace("table:%s, send create table msg, ahandle:%p", pCreate->tableId, ahandle); +// SRpcMsg rpcMsg = { +// .handle = ahandle, +// .pCont = pCreate, +// .contLen = htonl(pCreate->contLen), +// .code = 0, +// .msgType = TSDB_MSG_TYPE_MD_CREATE_TABLE +// }; +// rpcSendRequest(tsMgmtDClientRpc, ipSet, &rpcMsg); +//} +// + + +void mgmtProcessCreateTable(SVgObj *pVgroup, SCreateTableMsg *pCreate, int32_t contLen, void *thandle, bool isGetMeta) { + assert(pVgroup != NULL); + SRpcMsg rpcRsp = {.handle = thandle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; + + int32_t sid = taosAllocateId(pVgroup->idPool); + if (sid < 0) { + mTrace("table:%s, no enough sid in vgroup:%d, start to create a new vgroup", pCreate->tableId, pVgroup->vgId); + mgmtProcessCreateVgroup(pCreate, contLen, thandle, isGetMeta); + return; + } + + STableInfo *pTable; + SDMCreateTableMsg *pDCreate = NULL; + + if (pCreate->numOfColumns == 0) { + mTrace("table:%s, start to create child table, vgroup:%d sid:%d", pCreate->tableId, pVgroup->vgId, sid); + rpcRsp.code = mgmtCreateChildTable(pCreate, contLen, pVgroup, sid, &pDCreate, &pTable); + } else { + mTrace("table:%s, start to create normal table, vgroup:%d sid:%d", pCreate->tableId, pVgroup->vgId, sid); + rpcRsp.code = mgmtCreateNormalTable(pCreate, contLen, pVgroup, sid, &pDCreate, &pTable); + } + + if (rpcRsp.code != TSDB_CODE_SUCCESS) { + mTrace("table:%s, failed to create table in vgroup:%d sid:%d ", pCreate->tableId, pVgroup->vgId, sid); + rpcSendResponse(&rpcRsp); + return; + } + + assert(pDCreate != NULL); + assert(pTable != NULL); + + SProcessInfo *info = calloc(1, sizeof(SProcessInfo)); + info->type = TSDB_PROCESS_CREATE_TABLE; + info->thandle = thandle; + info->ahandle = pTable; + SRpcIpSet ipSet = mgmtGetIpSetFromVgroup(pVgroup); + if (isGetMeta) { + info->type = TSDB_PROCESS_CREATE_TABLE_GET_META; + } + + SRpcMsg rpcMsg = { + .handle = info, + .pCont = pCreate, + .contLen = htonl(pDCreate->contLen), + .code = 0, + .msgType = TSDB_MSG_TYPE_MD_CREATE_TABLE + }; + mgmtSendMsgToDnode(&ipSet, &rpcMsg); +} + int32_t mgmtCreateTable(SCreateTableMsg *pCreate, int32_t contLen, void *thandle, bool isGetMeta) { SDbObj *pDb = mgmtGetDb(pCreate->db); if (pDb == NULL) { @@ -246,7 +374,7 @@ int32_t mgmtAlterTable(SDbObj *pDb, SAlterTableMsg *pAlter) { return TSDB_CODE_OPS_NOT_SUPPORT; } -void mgmtCleanUpMeters() { +void mgmtCleanUpTables() { mgmtCleanUpNormalTables(); mgmtCleanUpChildTables(); mgmtCleanUpSuperTables(); @@ -422,3 +550,295 @@ void mgmtSetTableDirty(STableInfo *pTable, bool isDirty) { pTable->dirty = isDirty; } +void mgmtProcessCreateTableMsg(SRpcMsg *rpcMsg) { + SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; + + SCreateTableMsg *pCreate = (SCreateTableMsg *) rpcMsg->pCont; + pCreate->numOfColumns = htons(pCreate->numOfColumns); + pCreate->numOfTags = htons(pCreate->numOfTags); + pCreate->sqlLen = htons(pCreate->sqlLen); + + SSchema *pSchema = (SSchema*) pCreate->schema; + for (int32_t i = 0; i < pCreate->numOfColumns + pCreate->numOfTags; ++i) { + pSchema->bytes = htons(pSchema->bytes); + pSchema->colId = i; + pSchema++; + } + + if (mgmtCheckRedirect(rpcMsg->handle) != TSDB_CODE_SUCCESS) { + mError("table:%s, failed to create table, need redirect message", pCreate->tableId); + return; + } + + SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); + if (pUser == NULL) { + mError("table:%s, failed to create table, invalid user", pCreate->tableId); + rpcRsp.code = TSDB_CODE_INVALID_USER; + rpcSendResponse(&rpcRsp); + return; + } + + if (!pUser->writeAuth) { + mError("table:%s, failed to create table, no rights", pCreate->tableId); + rpcRsp.code = TSDB_CODE_NO_RIGHTS; + rpcSendResponse(&rpcRsp); + return; + } + + int32_t code = mgmtCreateTable(pCreate, rpcMsg->contLen, rpcMsg->handle, false); + if (code != TSDB_CODE_ACTION_IN_PROGRESS) { + rpcRsp.code = code; + rpcSendResponse(&rpcRsp); + } +} + +void mgmtProcessDropTableMsg(SRpcMsg *rpcMsg) { + SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; + SDropTableMsg *pDrop = (SDropTableMsg *) rpcMsg->pCont; + + if (mgmtCheckRedirect(rpcMsg->handle) != TSDB_CODE_SUCCESS) { + mError("table:%s, failed to drop table, need redirect message", pDrop->tableId); + return; + } + + SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); + if (pUser == NULL) { + mError("table:%s, failed to drop table, invalid user", pDrop->tableId); + rpcRsp.code = TSDB_CODE_INVALID_USER; + rpcSendResponse(&rpcRsp); + return; + } + + if (!pUser->writeAuth) { + mError("table:%s, failed to drop table, no rights", pDrop->tableId); + rpcRsp.code = TSDB_CODE_NO_RIGHTS; + rpcSendResponse(&rpcRsp); + return; + } + + SDbObj *pDb = mgmtGetDbByTableId(pDrop->tableId); + if (pDb == NULL) { + mError("table:%s, failed to drop table, db not selected", pDrop->tableId); + rpcRsp.code = TSDB_CODE_DB_NOT_SELECTED; + rpcSendResponse(&rpcRsp); + return; + } + + int32_t code = mgmtDropTable(pDb, pDrop->tableId, pDrop->igNotExists); + if (code != TSDB_CODE_ACTION_IN_PROGRESS) { + rpcRsp.code = code; + rpcSendResponse(&rpcRsp); + } +} + +void mgmtProcessAlterTableMsg(SRpcMsg *rpcMsg) { + SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; + if (mgmtCheckRedirect(rpcMsg->handle) != TSDB_CODE_SUCCESS) { + return; + } + + SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); + if (pUser == NULL) { + rpcRsp.code = TSDB_CODE_INVALID_USER; + rpcSendResponse(&rpcRsp); + return; + } + + SAlterTableMsg *pAlter = (SAlterTableMsg *) rpcMsg->pCont; + + if (!pUser->writeAuth) { + rpcRsp.code = TSDB_CODE_NO_RIGHTS; + } else { + pAlter->type = htons(pAlter->type); + pAlter->numOfCols = htons(pAlter->numOfCols); + + if (pAlter->numOfCols > 2) { + mError("table:%s error numOfCols:%d in alter table", pAlter->tableId, pAlter->numOfCols); + rpcRsp.code = TSDB_CODE_APP_ERROR; + } else { + SDbObj *pDb = mgmtGetDb(pAlter->db); + if (pDb) { + for (int32_t i = 0; i < pAlter->numOfCols; ++i) { + pAlter->schema[i].bytes = htons(pAlter->schema[i].bytes); + } + + rpcRsp.code = mgmtAlterTable(pDb, pAlter); + if (rpcRsp.code == 0) { + mLPrint("table:%s is altered by %s", pAlter->tableId, pUser->user); + } + } else { + rpcRsp.code = TSDB_CODE_DB_NOT_SELECTED; + } + } + } + + rpcSendResponse(&rpcRsp); +} + +void mgmtProcessGetTableMeta(STableInfo *pTable, void *thandle) { + SRpcMsg rpcRsp = {.handle = thandle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; + SDbObj* pDb = mgmtGetDbByTableId(pTable->tableId); + if (pDb == NULL || pDb->dropStatus != TSDB_DB_STATUS_READY) { + mError("table:%s, failed to get table meta, db not selected", pTable->tableId); + rpcRsp.code = TSDB_CODE_DB_NOT_SELECTED; + rpcSendResponse(&rpcRsp); + return; + } + + SRpcConnInfo connInfo; + rpcGetConnInfo(thandle, &connInfo); + bool usePublicIp = (connInfo.serverIp == tsPublicIpInt); + + STableMeta *pMeta = rpcMallocCont(sizeof(STableMeta) + sizeof(SSchema) * TSDB_MAX_COLUMNS); + rpcRsp.code = mgmtGetTableMeta(pDb, pTable, pMeta, usePublicIp); + + if (rpcRsp.code != TSDB_CODE_SUCCESS) { + rpcFreeCont(pMeta); + } else { + pMeta->contLen = htons(pMeta->contLen); + rpcRsp.pCont = pMeta; + rpcRsp.contLen = pMeta->contLen; + } + + rpcSendResponse(&rpcRsp); +} + + +void mgmtProcessTableMetaMsg(SRpcMsg *rpcMsg) { + SRpcMsg rpcRsp; + rpcRsp.handle = rpcMsg->handle; + rpcRsp.pCont = NULL; + rpcRsp.contLen = 0; + + STableInfoMsg *pInfo = rpcMsg->pCont; + pInfo->createFlag = htons(pInfo->createFlag); + + SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); + if (pUser == NULL) { + mError("table:%s, failed to get table meta, invalid user", pInfo->tableId); + rpcRsp.code = TSDB_CODE_INVALID_USER; + rpcSendResponse(&rpcRsp); + return; + } + + STableInfo *pTable = mgmtGetTable(pInfo->tableId); + if (pTable == NULL) { + if (pInfo->createFlag != 1) { + mError("table:%s, failed to get table meta, table not exist", pInfo->tableId); + rpcRsp.code = TSDB_CODE_INVALID_TABLE; + rpcSendResponse(&rpcRsp); + return; + } else { + // on demand create table from super table if table does not exists + if (mgmtCheckRedirect(rpcMsg->handle) != TSDB_CODE_SUCCESS) { + mError("table:%s, failed to create table while get meta info, need redirect message", pInfo->tableId); + return; + } + + int32_t contLen = sizeof(SCreateTableMsg) + sizeof(STagData); + SCreateTableMsg *pCreateMsg = rpcMallocCont(contLen); + if (pCreateMsg == NULL) { + mError("table:%s, failed to create table while get meta info, no enough memory", pInfo->tableId); + rpcRsp.code = TSDB_CODE_SERV_OUT_OF_MEMORY; + rpcSendResponse(&rpcRsp); + return; + } + + memcpy(pCreateMsg->schema, pInfo->tags, sizeof(STagData)); + strcpy(pCreateMsg->tableId, pInfo->tableId); + + mError("table:%s, start to create table while get meta info", pInfo->tableId); + mgmtCreateTable(pCreateMsg, contLen, rpcMsg->handle, true); + } + } else { + mgmtProcessGetTableMeta(pTable, rpcMsg->handle); + } +} + +void mgmtProcessMultiTableMetaMsg(SRpcMsg *rpcMsg) { + SRpcMsg rpcRsp; + rpcRsp.handle = rpcMsg->handle; + rpcRsp.pCont = NULL; + rpcRsp.contLen = 0; + + SRpcConnInfo connInfo; + rpcGetConnInfo(rpcMsg->handle, &connInfo); + + bool usePublicIp = (connInfo.serverIp == tsPublicIpInt); + SUserObj *pUser = mgmtGetUser(connInfo.user); + if (pUser == NULL) { + rpcRsp.code = TSDB_CODE_INVALID_USER; + rpcSendResponse(&rpcRsp); + return; + } + + SMultiTableInfoMsg *pInfo = rpcMsg->pCont; + pInfo->numOfTables = htonl(pInfo->numOfTables); + + int32_t totalMallocLen = 4*1024*1024; // first malloc 4 MB, subsequent reallocation as twice + SMultiTableMeta *pMultiMeta = rpcMallocCont(totalMallocLen); + if (pMultiMeta == NULL) { + rpcRsp.code = TSDB_CODE_SERV_OUT_OF_MEMORY; + rpcSendResponse(&rpcRsp); + return; + } + + pMultiMeta->contLen = sizeof(SMultiTableMeta); + pMultiMeta->numOfTables = 0; + + for (int t = 0; t < pInfo->numOfTables; ++t) { + char *tableId = (char*)(pInfo->tableIds + t * TSDB_TABLE_ID_LEN); + STableInfo *pTable = mgmtGetTable(tableId); + if (pTable == NULL) continue; + + SDbObj *pDb = mgmtGetDbByTableId(tableId); + if (pDb == NULL) continue; + + int availLen = totalMallocLen - pMultiMeta->contLen; + if (availLen <= sizeof(STableMeta) + sizeof(SSchema) * TSDB_MAX_COLUMNS) { + //TODO realloc + //totalMallocLen *= 2; + //pMultiMeta = rpcReMalloc(pMultiMeta, totalMallocLen); + //if (pMultiMeta == NULL) { + /// rpcSendResponse(ahandle, TSDB_CODE_SERV_OUT_OF_MEMORY, NULL, 0); + // return TSDB_CODE_SERV_OUT_OF_MEMORY; + //} else { + // t--; + // continue; + //} + } + + STableMeta *pMeta = (STableMeta *)(pMultiMeta->metas + pMultiMeta->contLen); + int32_t code = mgmtGetTableMeta(pDb, pTable, pMeta, usePublicIp); + if (code == TSDB_CODE_SUCCESS) { + pMultiMeta->numOfTables ++; + pMultiMeta->contLen += pMeta->contLen; + } + } + + rpcRsp.pCont = pMultiMeta; + rpcRsp.contLen = pMultiMeta->contLen; + rpcSendResponse(&rpcRsp); +} + +void mgmtProcessSuperTableMetaMsg(SRpcMsg *rpcMsg) { + SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; + SSuperTableInfoMsg *pInfo = rpcMsg->pCont; + STableInfo *pTable = mgmtGetSuperTable(pInfo->tableId); + if (pTable == NULL) { + rpcRsp.code = TSDB_CODE_INVALID_TABLE; + rpcSendResponse(&rpcRsp); + return; + } + + SSuperTableInfoRsp *pRsp = mgmtGetSuperTableVgroup((SSuperTableObj *) pTable); + if (pRsp != NULL) { + int32_t msgLen = sizeof(SSuperTableObj) + htonl(pRsp->numOfDnodes) * sizeof(int32_t); + rpcRsp.pCont = pRsp; + rpcRsp.contLen = msgLen; + rpcSendResponse(&rpcRsp); + } else { + rpcRsp.code = TSDB_CODE_INVALID_TABLE; + rpcSendResponse(&rpcRsp); + } +} \ No newline at end of file diff --git a/src/mnode/src/mgmtUser.c b/src/mnode/src/mgmtUser.c index 1503b721ab0e5000807f07038528ec822ffd16fb..e3ea2292d81a59e1f62ccb1a27d5128132044a73 100644 --- a/src/mnode/src/mgmtUser.c +++ b/src/mnode/src/mgmtUser.c @@ -32,7 +32,6 @@ static int32_t mgmtDropUser(SAcctObj *pAcct, char *name); static int32_t mgmtUpdateUser(SUserObj *pUser); static int32_t mgmtGetUserMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn); static int32_t mgmtRetrieveUsers(SShowObj *pShow, char *data, int32_t rows, void *pConn); -static SUserObj *mgmtGetUserFromConn(void *pConn); static void mgmtProcessCreateUserMsg(SRpcMsg *rpcMsg); static void mgmtProcessAlterUserMsg(SRpcMsg *rpcMsg); @@ -329,7 +328,7 @@ static void *mgmtUserActionDestroy(void *row, char *str, int32_t size, int32_t * return NULL; } -static SUserObj *mgmtGetUserFromConn(void *pConn) { +SUserObj *mgmtGetUserFromConn(void *pConn) { SRpcConnInfo connInfo; rpcGetConnInfo(pConn, &connInfo); diff --git a/src/mnode/src/mgmtVgroup.c b/src/mnode/src/mgmtVgroup.c index 84ed20c00217c41c1d71e7835067cc87d26ddde6..f8331ec968bf1cf23386d3024040097838072a48 100644 --- a/src/mnode/src/mgmtVgroup.c +++ b/src/mnode/src/mgmtVgroup.c @@ -22,7 +22,9 @@ #include "mnode.h" #include "mgmtBalance.h" #include "mgmtDb.h" +#include "mgmtDClient.h" #include "mgmtDnode.h" +#include "mgmtShell.h" #include "mgmtTable.h" #include "mgmtVgroup.h" @@ -38,6 +40,9 @@ static void *mgmtVgroupActionDecode(void *row, char *str, int32_t size, int32_t static void *mgmtVgroupActionReset(void *row, char *str, int32_t size, int32_t *ssize); static void *mgmtVgroupActionDestroy(void *row, char *str, int32_t size, int32_t *ssize); +static int32_t mgmtGetVgroupMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn); +static int32_t mgmtRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, void *pConn); + static void mgmtVgroupActionInit() { SVgObj tObj; tsVgUpdateSize = tObj.updateEnd - (int8_t *)&tObj; @@ -107,6 +112,9 @@ int32_t mgmtInitVgroups() { mgmtSetDnodeVgid(pVgroup->vnodeGid, pVgroup->numOfVnodes, pVgroup->vgId); } + mgmtAddShellShowMetaHandle(TSDB_MGMT_TABLE_VGROUP, mgmtGetVgroupMeta); + mgmtAddShellShowRetrieveHandle(TSDB_MGMT_TABLE_VGROUP, mgmtRetrieveVgroups); + mTrace("vgroup is initialized"); return 0; } @@ -192,7 +200,7 @@ int32_t mgmtDropVgroup(SDbObj *pDb, SVgObj *pVgroup) { mTrace("vgroup:%d, db:%s replica:%d is deleted", pVgroup->vgId, pDb->name, pVgroup->numOfVnodes); - mgmtSendDropVgroupMsg(pVgroup, NULL); + //mgmtSendDropVgroupMsg(pVgroup, NULL); sdbDeleteRow(tsVgroupSdb, pVgroup); @@ -560,4 +568,25 @@ SRpcIpSet mgmtGetIpSetFromVgroup(SVgObj *pVgroup) { SRpcIpSet mgmtGetIpSetFromIp(uint32_t ip) { SRpcIpSet ipSet = {.ip[0] = ip, .numOfIps = 1, .inUse = 0, .port = tsMgmtDnodePort + 1}; return ipSet; +} + +void mgmtSendCreateVnodeMsg(SVgObj *pVgroup, int32_t vnode, SRpcIpSet *ipSet, void *ahandle) { + mTrace("vgroup:%d, send create vnode:%d msg, ahandle:%p", pVgroup->vgId, vnode, ahandle); + SMDCreateVnodeMsg *pCreate = mgmtBuildCreateVnodeMsg(pVgroup, vnode); + SRpcMsg rpcMsg = { + .handle = ahandle, + .pCont = pCreate, + .contLen = pCreate ? sizeof(SMDCreateVnodeMsg) : 0, + .code = 0, + .msgType = TSDB_MSG_TYPE_MD_CREATE_VNODE + }; + mgmtSendMsgToDnode(ipSet, &rpcMsg); +} + +void mgmtSendCreateVgroupMsg(SVgObj *pVgroup, void *ahandle) { + mTrace("vgroup:%d, send create all vnodes msg, handle:%p", pVgroup->vgId, ahandle); + for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) { + SRpcIpSet ipSet = mgmtGetIpSetFromIp(pVgroup->vnodeGid[i].ip); + mgmtSendCreateVnodeMsg(pVgroup, pVgroup->vnodeGid[i].vnode, &ipSet, ahandle); + } } \ No newline at end of file