From ff428696d59ed0a678f94cffdba3999c3b750527 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Thu, 27 Oct 2022 15:02:50 +0800 Subject: [PATCH] enh: drop snode --- source/common/src/systable.c | 2 +- source/dnode/mgmt/mgmt_dnode/src/dmHandle.c | 1 - source/dnode/mnode/impl/src/mndSnode.c | 8 -- tests/script/jenkins/basic.txt | 5 +- tests/script/tsim/db/dropdnodes.sim | 107 -------------------- 5 files changed, 3 insertions(+), 120 deletions(-) delete mode 100644 tests/script/tsim/db/dropdnodes.sim diff --git a/source/common/src/systable.c b/source/common/src/systable.c index 24f71a47c0..d3d006ab35 100644 --- a/source/common/src/systable.c +++ b/source/common/src/systable.c @@ -270,7 +270,7 @@ static const SSysTableMeta infosMeta[] = { {TSDB_INS_TABLE_MNODES, mnodesSchema, tListLen(mnodesSchema), true}, {TSDB_INS_TABLE_MODULES, modulesSchema, tListLen(modulesSchema), true}, {TSDB_INS_TABLE_QNODES, qnodesSchema, tListLen(qnodesSchema), true}, - // {TSDB_INS_TABLE_SNODES, snodesSchema, tListLen(snodesSchema)}, + {TSDB_INS_TABLE_SNODES, snodesSchema, tListLen(snodesSchema)}, {TSDB_INS_TABLE_CLUSTER, clusterSchema, tListLen(clusterSchema), true}, {TSDB_INS_TABLE_DATABASES, userDBSchema, tListLen(userDBSchema), false}, {TSDB_INS_TABLE_FUNCTIONS, userFuncSchema, tListLen(userFuncSchema), false}, diff --git a/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c b/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c index 782c828bb2..f12dce5149 100644 --- a/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c +++ b/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c @@ -332,7 +332,6 @@ SArray *dmGetMsgHandles() { // Requests handled by MNODE if (dmSetMgmtHandle(pArray, TDMT_MND_GRANT, dmPutNodeMsgToMgmtQueue, 0) == NULL) goto _OVER; - // if (dmSetMgmtHandle(pArray, TDMT_MND_GRANT_RSP, dmPutNodeMsgToMgmtQueue, 0) == NULL) goto _OVER; if (dmSetMgmtHandle(pArray, TDMT_MND_AUTH_RSP, dmPutNodeMsgToMgmtQueue, 0) == NULL) goto _OVER; code = 0; diff --git a/source/dnode/mnode/impl/src/mndSnode.c b/source/dnode/mnode/impl/src/mndSnode.c index 8127d5912e..bb93745aee 100644 --- a/source/dnode/mnode/impl/src/mndSnode.c +++ b/source/dnode/mnode/impl/src/mndSnode.c @@ -273,9 +273,6 @@ _OVER: } static int32_t mndProcessCreateSnodeReq(SRpcMsg *pReq) { -#if 1 - return TSDB_CODE_OPS_NOT_SUPPORT; -#else SMnode *pMnode = pReq->info.node; int32_t code = -1; SSnodeObj *pObj = NULL; @@ -318,7 +315,6 @@ _OVER: mndReleaseSnode(pMnode, pObj); mndReleaseDnode(pMnode, pDnode); return code; -#endif } static int32_t mndSetDropSnodeRedoLogs(STrans *pTrans, SSnodeObj *pObj) { @@ -390,9 +386,6 @@ _OVER: } static int32_t mndProcessDropSnodeReq(SRpcMsg *pReq) { -#if 1 - return TSDB_CODE_OPS_NOT_SUPPORT; -#else SMnode *pMnode = pReq->info.node; int32_t code = -1; SSnodeObj *pObj = NULL; @@ -429,7 +422,6 @@ _OVER: mndReleaseSnode(pMnode, pObj); return code; -#endif } static int32_t mndRetrieveSnodes(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBlock, int32_t rows) { diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt index 83ecc69b74..c091650e78 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -25,7 +25,6 @@ ./test.sh -f tsim/db/delete_reusevnode2.sim ./test.sh -f tsim/db/delete_writing1.sim ./test.sh -f tsim/db/delete_writing2.sim -# unsupport ./test.sh -f tsim/db/dropdnodes.sim ./test.sh -f tsim/db/error1.sim ./test.sh -f tsim/db/keep.sim ./test.sh -f tsim/db/len.sim @@ -44,7 +43,7 @@ ./test.sh -f tsim/dnode/balancex.sim ./test.sh -f tsim/dnode/create_dnode.sim ./test.sh -f tsim/dnode/drop_dnode_has_mnode.sim -# unsupport ./test.sh -f tsim/dnode/drop_dnode_has_qnode_snode.sim +./test.sh -f tsim/dnode/drop_dnode_has_qnode_snode.sim ./test.sh -f tsim/dnode/drop_dnode_has_vnode_replica1.sim ./test.sh -f tsim/dnode/drop_dnode_has_vnode_replica3.sim ./test.sh -f tsim/dnode/drop_dnode_has_multi_vnode_replica1.sim @@ -185,7 +184,7 @@ ./test.sh -f tsim/qnode/basic1.sim # ---- snode ---- -# unsupport ./test.sh -f tsim/snode/basic1.sim +./test.sh -f tsim/snode/basic1.sim # ---- mnode ./test.sh -f tsim/mnode/basic1.sim diff --git a/tests/script/tsim/db/dropdnodes.sim b/tests/script/tsim/db/dropdnodes.sim deleted file mode 100644 index 20b4a136df..0000000000 --- a/tests/script/tsim/db/dropdnodes.sim +++ /dev/null @@ -1,107 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/deploy.sh -n dnode1 -i 1 -system sh/cfg.sh -n dnode1 -c walLevel -v 2 -system sh/deploy.sh -n dnode2 -i 2 -system sh/cfg.sh -n dnode1 -c walLevel -v 2 -system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4 -system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 4 - -print ========== prepare data -system sh/exec.sh -n dnode1 -s start -system sh/exec.sh -n dnode2 -s start - -sleep 2000 -sql connect - -sql create dnode $hostname2 -sleep 2000 - -sql create database db -sql use db - -print ========== step1 -sql create table mt (ts timestamp, tbcol int) TAGS(tgcol int) -sql create table db.t1 using db.mt tags(1) -sql create table db.t2 using db.mt tags(2) -sql create table db.t3 using db.mt tags(3) -sql create table db.t4 using db.mt tags(4) -sql create table db.t5 using db.mt tags(5) -sql create table db.t6 using db.mt tags(6) -sql create table db.t7 using db.mt tags(7) -sql create table db.t8 using db.mt tags(8) -sql create table db.t9 using db.mt tags(9) -sql create table db.t10 using db.mt tags(10) -sql create table db.t11 using db.mt tags(11) -sql create table db.t12 using db.mt tags(12) -sql create table db.t13 using db.mt tags(13) -sql create table db.t14 using db.mt tags(14) -sql create table db.t15 using db.mt tags(15) -sql create table db.t16 using db.mt tags(16) - -sql insert into db.t1 values(now, 1) -sql insert into db.t2 values(now, 1) -sql insert into db.t3 values(now, 1) -sql insert into db.t4 values(now, 1) -sql insert into db.t5 values(now, 1) -sql insert into db.t6 values(now, 1) -sql insert into db.t7 values(now, 1) -sql insert into db.t8 values(now, 1) -sql insert into db.t9 values(now, 1) -sql insert into db.t10 values(now, 1) -sql insert into db.t11 values(now, 1) -sql insert into db.t12 values(now, 1) -sql insert into db.t13 values(now, 1) -sql insert into db.t14 values(now, 1) -sql insert into db.t15 values(now, 1) -sql insert into db.t16 values(now, 1) - -print ========== step2 -sql show tables -print $rows -if $rows != 16 then - return -1 -endi - -sql select * from mt -print $rows -if $rows != 16 then - return -1 -endi - -print ========== step3 - -system sh/exec.sh -n dnode2 -s stop -x SIGINT -sleep 3000 -sql drop dnode $hostname2 -sleep 2000 - -print ========== step3 - -sql show tables -print $rows -if $rows != 8 then - return -1 -endi - -sql select * from mt -print $rows -if $rows != 8 then - return -1 -endi - -sql select * from db.t5 -if $rows != 1 then - return -1 -endi - -sql select * from db.t13 -if $rows != 1 then - return -1 -endi - -sql_error select * from db.t1 -sql_error select * from db.t9 - -system sh/exec.sh -n dnode1 -s stop -x SIGINT -system sh/exec.sh -n dnode2 -s stop -x SIGINT