From d2253e0b7260278852a27e3e329b243a07fa11d7 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Wed, 16 Feb 2022 17:39:37 +0800 Subject: [PATCH] minor changes --- source/dnode/mnode/impl/src/mndDnode.c | 12 +++++------- source/dnode/mnode/impl/src/mndVgroup.c | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/source/dnode/mnode/impl/src/mndDnode.c b/source/dnode/mnode/impl/src/mndDnode.c index 07b38bdc6a..6d0b8e7c8d 100644 --- a/source/dnode/mnode/impl/src/mndDnode.c +++ b/source/dnode/mnode/impl/src/mndDnode.c @@ -609,14 +609,12 @@ static int32_t mndProcessConfigDnodeReq(SMnodeMsg *pReq) { SEpSet epSet = mndGetDnodeEpset(pDnode); mndReleaseDnode(pMnode, pDnode); - SDCfgDnodeReq *pCfgDnode = rpcMallocCont(sizeof(SDCfgDnodeReq)); - pCfgDnode->dnodeId = htonl(cfgReq.dnodeId); - memcpy(pCfgDnode->config, cfgReq.config, TSDB_DNODE_CONFIG_LEN); + int32_t bufLen = tSerializeSMCfgDnodeReq(NULL, 0, &cfgReq); + void *pBuf = rpcMallocCont(bufLen); + tSerializeSMCfgDnodeReq(pBuf, bufLen, &cfgReq); - SRpcMsg rpcMsg = {.msgType = TDMT_DND_CONFIG_DNODE, - .pCont = pCfgDnode, - .contLen = sizeof(SDCfgDnodeReq), - .ahandle = pReq->rpcMsg.ahandle}; + SRpcMsg rpcMsg = { + .msgType = TDMT_DND_CONFIG_DNODE, .pCont = pBuf, .contLen = bufLen, .ahandle = pReq->rpcMsg.ahandle}; mInfo("dnode:%d, app:%p config:%s req send to dnode", cfgReq.dnodeId, rpcMsg.ahandle, cfgReq.config); mndSendReqToDnode(pMnode, &epSet, &rpcMsg); diff --git a/source/dnode/mnode/impl/src/mndVgroup.c b/source/dnode/mnode/impl/src/mndVgroup.c index 90d190c1be..a2438a3b8e 100644 --- a/source/dnode/mnode/impl/src/mndVgroup.c +++ b/source/dnode/mnode/impl/src/mndVgroup.c @@ -223,8 +223,8 @@ void *mndBuildCreateVnodeReq(SMnode *pMnode, SDnodeObj *pDnode, SDbObj *pDb, SVg return NULL; } - pReplica->id = htonl(pVgidDnode->id); - pReplica->port = htons(pVgidDnode->port); + pReplica->id = pVgidDnode->id; + pReplica->port = pVgidDnode->port; memcpy(pReplica->fqdn, pVgidDnode->fqdn, TSDB_FQDN_LEN); mndReleaseDnode(pMnode, pVgidDnode);