From 7354b9e193ea2160d169209723c6a0c99b96d566 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Mon, 1 Nov 2021 20:38:50 +0800 Subject: [PATCH] minor changes --- source/dnode/mgmt/inc/dnodeInt.h | 1 - source/dnode/mgmt/inc/dnodeMnode.h | 3 +++ source/dnode/mgmt/inc/dnodeVnodes.h | 8 ++---- source/dnode/mgmt/src/dnodeInt.c | 42 ++++++----------------------- source/dnode/mgmt/src/dnodeMain.c | 6 ++--- source/dnode/mgmt/src/dnodeMnode.c | 34 +++++++++++++++++++++++ source/dnode/mgmt/src/dnodeVnodes.c | 22 +++++++++++++++ 7 files changed, 71 insertions(+), 45 deletions(-) create mode 100644 source/dnode/mgmt/src/dnodeMnode.c diff --git a/source/dnode/mgmt/inc/dnodeInt.h b/source/dnode/mgmt/inc/dnodeInt.h index 20257140d6..bccafcee85 100644 --- a/source/dnode/mgmt/inc/dnodeInt.h +++ b/source/dnode/mgmt/inc/dnodeInt.h @@ -24,7 +24,6 @@ extern "C" { #include "tglobal.h" #include "tlog.h" #include "trpc.h" -#include "ttimer.h" extern int32_t dDebugFlag; diff --git a/source/dnode/mgmt/inc/dnodeMnode.h b/source/dnode/mgmt/inc/dnodeMnode.h index 0dccb8c39d..00868535c1 100644 --- a/source/dnode/mgmt/inc/dnodeMnode.h +++ b/source/dnode/mgmt/inc/dnodeMnode.h @@ -21,6 +21,9 @@ extern "C" { #endif #include "dnodeInt.h" +int32_t dnodeInitMnode(); +void dnodeCleanupMnode(); + void dnodeProcessCreateMnodeReq(SRpcMsg *pMsg); #ifdef __cplusplus diff --git a/source/dnode/mgmt/inc/dnodeVnodes.h b/source/dnode/mgmt/inc/dnodeVnodes.h index 33848042bd..fae1de7217 100644 --- a/source/dnode/mgmt/inc/dnodeVnodes.h +++ b/source/dnode/mgmt/inc/dnodeVnodes.h @@ -21,12 +21,8 @@ extern "C" { #endif #include "dnodeInt.h" -int32_t dnodeInitDnode(); -void dnodeCleanupDnode(); -void dnodeProcessStatusRsp(SRpcMsg *pMsg); -void dnodeProcessStartupReq(SRpcMsg *pMsg); -void dnodeProcessCreateMnodeReq(SRpcMsg *pMsg); -void dnodeProcessConfigDnodeReq(SRpcMsg *pMsg); +int32_t dnodeInitVnodes(); +void dnodeCleanupVnodes(); #ifdef __cplusplus } diff --git a/source/dnode/mgmt/src/dnodeInt.c b/source/dnode/mgmt/src/dnodeInt.c index 6368fe95f7..df84896be7 100644 --- a/source/dnode/mgmt/src/dnodeInt.c +++ b/source/dnode/mgmt/src/dnodeInt.c @@ -17,14 +17,14 @@ #include "dnodeCheck.h" #include "dnodeConfig.h" #include "dnodeDnode.h" +#include "dnodeMnode.h" #include "dnodeTransport.h" -#include "mnode.h" +#include "dnodeVnodes.h" #include "sync.h" #include "tcache.h" #include "tconfig.h" #include "tnote.h" #include "tstep.h" -#include "vnode.h" #include "wal.h" static struct { @@ -37,7 +37,7 @@ EDnStat dnodeGetRunStat() { return tsInt.runStatus; } void dnodeSetRunStat(EDnStat stat) { tsInt.runStatus = stat; } -void dnodeReportStartup(char *name, char *desc) { +static void dnodeReportStartup(char *name, char *desc) { SStartupStep *startup = &tsInt.startup; tstrncpy(startup->name, name, strlen(startup->name)); tstrncpy(startup->desc, desc, strlen(startup->desc)); @@ -53,24 +53,6 @@ static void dnodeReportStartupFinished(char *name, char *desc) { void dnodeGetStartup(SStartupStep *pStep) { memcpy(pStep, &tsInt.startup, sizeof(SStartupStep)); } -static int32_t dnodeInitVnode() { - return vnodeInit(); -} - -static int32_t dnodeInitMnode() { - SMnodePara para; - para.fp.GetDnodeEp = dnodeGetEp; - para.fp.SendMsgToDnode = dnodeSendMsgToDnode; - para.fp.SendMsgToMnode = dnodeSendMsgToMnode; - para.fp.SendRedirectMsg = dnodeSendRedirectMsg; - para.dnodeId = dnodeGetDnodeId(); - para.clusterId = dnodeGetClusterId(); - - return mnodeInit(para); -} - -static int32_t dnodeInitTfs() {} - static int32_t dnodeInitMain() { tsInt.runStatus = DN_RUN_STAT_STOPPED; tscEmbedded = 1; @@ -168,14 +150,14 @@ int32_t dnodeInit() { taosStepAdd(steps, "dnode-dir", dnodeInitDir, dnodeCleanupDir); taosStepAdd(steps, "dnode-check", dnodeInitCheck, dnodeCleanupCheck); taosStepAdd(steps, "dnode-rpc", rpcInit, rpcCleanup); - taosStepAdd(steps, "dnode-tfs", dnodeInitTfs, NULL); + taosStepAdd(steps, "dnode-tfs", NULL, NULL); taosStepAdd(steps, "dnode-wal", walInit, walCleanUp); taosStepAdd(steps, "dnode-sync", syncInit, syncCleanUp); - taosStepAdd(steps, "dnode-eps", dnodeInitConfig, dnodeCleanupConfig); - taosStepAdd(steps, "dnode-vnode", dnodeInitVnode, vnodeCleanup); - taosStepAdd(steps, "dnode-mnode", dnodeInitMnode, mnodeCleanup); + taosStepAdd(steps, "dnode-config", dnodeInitConfig, dnodeCleanupConfig); + taosStepAdd(steps, "dnode-vnodes", dnodeInitVnodes, dnodeCleanupVnodes); + taosStepAdd(steps, "dnode-mnode", dnodeInitMnode, dnodeCleanupMnode); taosStepAdd(steps, "dnode-trans", dnodeInitTrans, dnodeCleanupTrans); - taosStepAdd(steps, "dnode-msg", dnodeInitDnode, dnodeCleanupDnode); + taosStepAdd(steps, "dnode-dnode", dnodeInitDnode, dnodeCleanupDnode); tsInt.steps = steps; taosStepExec(tsInt.steps); @@ -194,11 +176,3 @@ void dnodeCleanup() { tsInt.steps = NULL; } } - -// tsVnode.msgFp[TSDB_MSG_TYPE_MD_CREATE_VNODE] = vnodeProcessMgmtMsg; -// tsVnode.msgFp[TSDB_MSG_TYPE_MD_ALTER_VNODE] = vnodeProcessMgmtMsg; -// tsVnode.msgFp[TSDB_MSG_TYPE_MD_SYNC_VNODE] = vnodeProcessMgmtMsg; -// tsVnode.msgFp[TSDB_MSG_TYPE_MD_COMPACT_VNODE] = vnodeProcessMgmtMsg; -// tsVnode.msgFp[TSDB_MSG_TYPE_MD_DROP_VNODE] = vnodeProcessMgmtMsg; -// tsVnode.msgFp[TSDB_MSG_TYPE_MD_ALTER_STREAM] = vnodeProcessMgmtMsg; - \ No newline at end of file diff --git a/source/dnode/mgmt/src/dnodeMain.c b/source/dnode/mgmt/src/dnodeMain.c index 69960173f4..1fbeb1e732 100644 --- a/source/dnode/mgmt/src/dnodeMain.c +++ b/source/dnode/mgmt/src/dnodeMain.c @@ -12,8 +12,8 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -#include "os.h" -#include "ulog.h" + +#define _DEFAULT_SOURCE #include "dnodeInt.h" static bool stop = false; @@ -35,8 +35,6 @@ int main(int argc, char const *argv[]) { exit(EXIT_FAILURE); } - dInfo("Started TDengine service successfully."); - while (!stop) { taosMsleep(100); } diff --git a/source/dnode/mgmt/src/dnodeMnode.c b/source/dnode/mgmt/src/dnodeMnode.c new file mode 100644 index 0000000000..47b1d89bb8 --- /dev/null +++ b/source/dnode/mgmt/src/dnodeMnode.c @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2019 TAOS Data, Inc. + * + * This program is free software: you can use, redistribute, and/or modify + * it under the terms of the GNU Affero General Public License, version 3 + * or later ("AGPL"), as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +#define _DEFAULT_SOURCE +#include "dnodeMnode.h" +#include "dnodeConfig.h" +#include "dnodeTransport.h" +#include "mnode.h" + +int32_t dnodeInitMnode() { + SMnodePara para; + para.fp.GetDnodeEp = dnodeGetEp; + para.fp.SendMsgToDnode = dnodeSendMsgToDnode; + para.fp.SendMsgToMnode = dnodeSendMsgToMnode; + para.fp.SendRedirectMsg = dnodeSendRedirectMsg; + para.dnodeId = dnodeGetDnodeId(); + para.clusterId = dnodeGetClusterId(); + + return mnodeInit(para); +} + +void dnodeCleanupMnode() { mnodeCleanup(); } \ No newline at end of file diff --git a/source/dnode/mgmt/src/dnodeVnodes.c b/source/dnode/mgmt/src/dnodeVnodes.c index e69de29bb2..765bd6fc22 100644 --- a/source/dnode/mgmt/src/dnodeVnodes.c +++ b/source/dnode/mgmt/src/dnodeVnodes.c @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2019 TAOS Data, Inc. + * + * This program is free software: you can use, redistribute, and/or modify + * it under the terms of the GNU Affero General Public License, version 3 + * or later ("AGPL"), as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +#define _DEFAULT_SOURCE +#include "dnodeDnode.h" +#include "vnode.h" + +int32_t dnodeInitVnodes() { return vnodeInit(); } + +void dnodeCleanupVnodes() { vnodeCleanup(); } \ No newline at end of file