From 9748f4be676edbb714f6229f6f059893ecc64bd8 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Tue, 28 Dec 2021 03:20:24 -0800 Subject: [PATCH] minor changes --- include/dnode/vnode/vnode.h | 10 ---------- source/dnode/vnode/impl/src/vnodeInt.c | 5 ----- tests/script/tmp/dnodes.sim | 23 +++++++++++------------ 3 files changed, 11 insertions(+), 27 deletions(-) diff --git a/include/dnode/vnode/vnode.h b/include/dnode/vnode/vnode.h index 812f313e71..0313c65acb 100644 --- a/include/dnode/vnode/vnode.h +++ b/include/dnode/vnode/vnode.h @@ -162,16 +162,6 @@ int vnodeProcessQueryReq(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp); */ int vnodeProcessFetchReq(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp); -/** - * @brief Process a consume message. - * - * @param pVnode The vnode object. - * @param pMsg The request message - * @param pRsp The response message - * @return int 0 for success, -1 for failure - */ -int vnodeProcessConsumeReq(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp); - /* ------------------------ SVnodeCfg ------------------------ */ /** * @brief Initialize VNODE options. diff --git a/source/dnode/vnode/impl/src/vnodeInt.c b/source/dnode/vnode/impl/src/vnodeInt.c index 65185f4a16..0f33fa65cd 100644 --- a/source/dnode/vnode/impl/src/vnodeInt.c +++ b/source/dnode/vnode/impl/src/vnodeInt.c @@ -28,8 +28,3 @@ int vnodeProcessSyncReq(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) { vInfo("sync message is processed"); return 0; } - -int vnodeProcessConsumeReq(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) { - vInfo("consume message is processed"); - return 0; -} diff --git a/tests/script/tmp/dnodes.sim b/tests/script/tmp/dnodes.sim index f5146620c5..f13f6026f9 100644 --- a/tests/script/tmp/dnodes.sim +++ b/tests/script/tmp/dnodes.sim @@ -2,20 +2,19 @@ system sh/stop_dnodes.sh ############## config parameter ##################### -$node1 = 192.168.101.174 +$node1 = 192.168.0.201 $node2 = 192.168.0.202 -$node2 = 192.168.0.203 -$node3 = 192.168.0.204 +$node3 = 192.168.0.203 +$node4 = 192.168.0.204 -$first = 1 -$num = 5 $self = $node1 +$num = 25 ############### deploy firstEp ##################### $firstEp = $node1 . :7100 $firstPort = 7100 -if $first == 1 then +if $self == $node1 then system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c firstEp -v $firstEp system sh/cfg.sh -n dnode1 -c secondEp -v $firstEp @@ -28,7 +27,7 @@ if $first == 1 then $i = 0 while $i < $num $port = $i * 100 - $port = $port + 8000 + $port = $port + 8100 $i = $i + 1 sql create dnode $node1 port $port endw @@ -36,7 +35,7 @@ if $first == 1 then $i = 0 while $i < $num $port = $i * 100 - $port = $port + 8000 + $port = $port + 8100 $i = $i + 1 sql create dnode $node2 port $port endw @@ -44,7 +43,7 @@ if $first == 1 then $i = 0 while $i < $num $port = $i * 100 - $port = $port + 8000 + $port = $port + 8100 $i = $i + 1 sql create dnode $node3 port $port endw @@ -52,7 +51,7 @@ if $first == 1 then $i = 0 while $i < $num $port = $i * 100 - $port = $port + 8000 + $port = $port + 8100 $i = $i + 1 sql create dnode $node4 port $port endw @@ -64,7 +63,7 @@ $i = 0 while $i < $num $index = $i + 80 $port = $i * 100 - $port = $port + 8000 + $port = $port + 8100 $dnodename = dnode . $index $i = $i + 1 @@ -74,5 +73,5 @@ while $i < $num system sh/cfg.sh -n $dnodename -c fqdn -v $self system sh/cfg.sh -n $dnodename -c serverPort -v $port - #system sh/exec.sh -n $dnodename -s start + system sh/exec.sh -n $dnodename -s start endw -- GitLab