From 7c7d8b33e9f920aae989107323ae6400fc56fa3f Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Sun, 13 Mar 2022 14:59:14 +0800 Subject: [PATCH] rename files --- source/dnode/mgmt/CMakeLists.txt | 11 ++- .../dnode/mgmt/{impl => bnode}/inc/dndBnode.h | 0 .../dnode/mgmt/{impl => bnode}/src/dndBnode.c | 0 source/dnode/mgmt/dnode/inc/dndMain.h | 4 +- source/dnode/mgmt/dnode/inc/dndMgmt.h | 3 +- source/dnode/mgmt/dnode/inc/dndMonitor.h | 2 +- .../mgmt/{impl => dnode}/inc/dndTransport.h | 4 +- .../mgmt/{impl => dnode}/inc/dndWorker.h | 3 +- source/dnode/mgmt/dnode/src/dndMain.c | 6 +- source/dnode/mgmt/dnode/src/dndMgmt.c | 72 +----------------- source/dnode/mgmt/dnode/src/dndMonitor.c | 74 ++++++++++++++++++- .../mgmt/{impl => dnode}/src/dndTransport.c | 0 .../mgmt/{impl => dnode}/src/dndWorker.c | 0 source/dnode/mgmt/impl/CMakeLists.txt | 17 ----- .../mgmt/{impl/mnodeMgmt => mnode}/inc/mm.h | 0 .../{impl/mnodeMgmt => mnode}/src/mmFile.c | 0 .../{impl/mnodeMgmt => mnode}/src/mmHandle.c | 0 .../{impl/mnodeMgmt => mnode}/src/mmMgmt.c | 0 .../{impl/mnodeMgmt => mnode}/src/mmWorker.c | 0 .../mgmt/{impl/src => qnode/inc}/dndQnode.c | 0 .../mgmt/{impl/inc => qnode/src}/dndQnode.h | 0 .../dnode/mgmt/{impl => snode}/inc/dndSnode.h | 0 .../dnode/mgmt/{impl => snode}/src/dndSnode.c | 0 .../mgmt/{impl => vnode}/inc/dndVnodes.h | 0 .../mgmt/{impl => vnode}/src/dndVnodes.c | 0 25 files changed, 98 insertions(+), 98 deletions(-) rename source/dnode/mgmt/{impl => bnode}/inc/dndBnode.h (100%) rename source/dnode/mgmt/{impl => bnode}/src/dndBnode.c (100%) rename source/dnode/mgmt/{impl => dnode}/inc/dndTransport.h (93%) rename source/dnode/mgmt/{impl => dnode}/inc/dndWorker.h (95%) rename source/dnode/mgmt/{impl => dnode}/src/dndTransport.c (100%) rename source/dnode/mgmt/{impl => dnode}/src/dndWorker.c (100%) delete mode 100644 source/dnode/mgmt/impl/CMakeLists.txt rename source/dnode/mgmt/{impl/mnodeMgmt => mnode}/inc/mm.h (100%) rename source/dnode/mgmt/{impl/mnodeMgmt => mnode}/src/mmFile.c (100%) rename source/dnode/mgmt/{impl/mnodeMgmt => mnode}/src/mmHandle.c (100%) rename source/dnode/mgmt/{impl/mnodeMgmt => mnode}/src/mmMgmt.c (100%) rename source/dnode/mgmt/{impl/mnodeMgmt => mnode}/src/mmWorker.c (100%) rename source/dnode/mgmt/{impl/src => qnode/inc}/dndQnode.c (100%) rename source/dnode/mgmt/{impl/inc => qnode/src}/dndQnode.h (100%) rename source/dnode/mgmt/{impl => snode}/inc/dndSnode.h (100%) rename source/dnode/mgmt/{impl => snode}/src/dndSnode.c (100%) rename source/dnode/mgmt/{impl => vnode}/inc/dndVnodes.h (100%) rename source/dnode/mgmt/{impl => vnode}/src/dndVnodes.c (100%) diff --git a/source/dnode/mgmt/CMakeLists.txt b/source/dnode/mgmt/CMakeLists.txt index 6440a42282..1872e91a7e 100644 --- a/source/dnode/mgmt/CMakeLists.txt +++ b/source/dnode/mgmt/CMakeLists.txt @@ -1,5 +1,10 @@ aux_source_directory(src DNODE_SRC) aux_source_directory(dnode/src DNODE_SRC) +aux_source_directory(qnode/src DNODE_SRC) +aux_source_directory(bnode/src DNODE_SRC) +aux_source_directory(snode/src DNODE_SRC) +aux_source_directory(vnode/src DNODE_SRC) +aux_source_directory(mnode/src DNODE_SRC) add_library(dnode STATIC ${DNODE_SRC}) target_link_libraries( @@ -8,8 +13,12 @@ target_link_libraries( target_include_directories( dnode PUBLIC "${CMAKE_SOURCE_DIR}/include/dnode/mgmt" - PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/dnode/inc" + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/qnode/inc" + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/bnode/inc" + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/snode/inc" + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/vnode/inc" + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/mnode/inc" ) add_subdirectory(exec) diff --git a/source/dnode/mgmt/impl/inc/dndBnode.h b/source/dnode/mgmt/bnode/inc/dndBnode.h similarity index 100% rename from source/dnode/mgmt/impl/inc/dndBnode.h rename to source/dnode/mgmt/bnode/inc/dndBnode.h diff --git a/source/dnode/mgmt/impl/src/dndBnode.c b/source/dnode/mgmt/bnode/src/dndBnode.c similarity index 100% rename from source/dnode/mgmt/impl/src/dndBnode.c rename to source/dnode/mgmt/bnode/src/dndBnode.c diff --git a/source/dnode/mgmt/dnode/inc/dndMain.h b/source/dnode/mgmt/dnode/inc/dndMain.h index 003f07bbd8..37d5f63396 100644 --- a/source/dnode/mgmt/dnode/inc/dndMain.h +++ b/source/dnode/mgmt/dnode/inc/dndMain.h @@ -16,12 +16,12 @@ #ifndef _TD_DND_MAIN_H_ #define _TD_DND_MAIN_H_ +#include "dndInt.h" + #ifdef __cplusplus extern "C" { #endif -#include "dndInt.h" - #ifdef __cplusplus } #endif diff --git a/source/dnode/mgmt/dnode/inc/dndMgmt.h b/source/dnode/mgmt/dnode/inc/dndMgmt.h index a9a114fb69..af29ff3d25 100644 --- a/source/dnode/mgmt/dnode/inc/dndMgmt.h +++ b/source/dnode/mgmt/dnode/inc/dndMgmt.h @@ -16,10 +16,11 @@ #ifndef _TD_DND_MGMT_H_ #define _TD_DND_MGMT_H_ +#include "dndInt.h" + #ifdef __cplusplus extern "C" { #endif -#include "dndInt.h.h" int32_t dndInitMgmt(SDnode *pDnode); void dndStopMgmt(SDnode *pDnode); diff --git a/source/dnode/mgmt/dnode/inc/dndMonitor.h b/source/dnode/mgmt/dnode/inc/dndMonitor.h index a153d5f975..12b9d347a6 100644 --- a/source/dnode/mgmt/dnode/inc/dndMonitor.h +++ b/source/dnode/mgmt/dnode/inc/dndMonitor.h @@ -22,7 +22,7 @@ extern "C" { #endif -int32_t dndGetMonitorDiskInfo(SDnode *pDnode, SMonDiskInfo *pInfo); +void dndSendMonitorReport(SDnode *pDnode); #ifdef __cplusplus } diff --git a/source/dnode/mgmt/impl/inc/dndTransport.h b/source/dnode/mgmt/dnode/inc/dndTransport.h similarity index 93% rename from source/dnode/mgmt/impl/inc/dndTransport.h rename to source/dnode/mgmt/dnode/inc/dndTransport.h index e0ea21cba8..c81ce9fd70 100644 --- a/source/dnode/mgmt/impl/inc/dndTransport.h +++ b/source/dnode/mgmt/dnode/inc/dndTransport.h @@ -16,12 +16,14 @@ #ifndef _TD_DND_TRANSPORT_H_ #define _TD_DND_TRANSPORT_H_ +#include "dndInt.h" + #ifdef __cplusplus extern "C" { #endif -#include "dndEnv.h" int32_t dndInitTrans(SDnode *pDnode); +void dndCleanupTransClient(SDnode *pDnode); void dndCleanupTrans(SDnode *pDnode); int32_t dndSendReqToMnode(SDnode *pDnode, SRpcMsg *pRpcMsg); int32_t dndSendReqToDnode(SDnode *pDnode, SEpSet *pEpSet, SRpcMsg *pRpcMsg); diff --git a/source/dnode/mgmt/impl/inc/dndWorker.h b/source/dnode/mgmt/dnode/inc/dndWorker.h similarity index 95% rename from source/dnode/mgmt/impl/inc/dndWorker.h rename to source/dnode/mgmt/dnode/inc/dndWorker.h index 9c037d91c7..22edb74c92 100644 --- a/source/dnode/mgmt/impl/inc/dndWorker.h +++ b/source/dnode/mgmt/dnode/inc/dndWorker.h @@ -16,10 +16,11 @@ #ifndef _TD_DND_WORKER_H_ #define _TD_DND_WORKER_H_ +#include "dndInt.h" + #ifdef __cplusplus extern "C" { #endif -#include "dndEnv.h" int32_t dndInitWorker(SDnode *pDnode, SDnodeWorker *pWorker, EWorkerType type, const char *name, int32_t minNum, int32_t maxNum, void *queueFp); diff --git a/source/dnode/mgmt/dnode/src/dndMain.c b/source/dnode/mgmt/dnode/src/dndMain.c index 20f65989a1..36ca3aada0 100644 --- a/source/dnode/mgmt/dnode/src/dndMain.c +++ b/source/dnode/mgmt/dnode/src/dndMain.c @@ -16,11 +16,11 @@ #define _DEFAULT_SOURCE #include "dndMain.h" // #include "dndBnode.h" -// #include "dndMgmt.h" +#include "dndMgmt.h" // #include "mm.h" // #include "dndQnode.h" // #include "dndSnode.h" -// #include "dndTransport.h" +#include "dndTransport.h" // #include "dndVnodes.h" // #include "monitor.h" // #include "sync.h" @@ -122,6 +122,7 @@ static int32_t dndInitDnodeResource(SDnode *pDnode) { static void dndClearDnodeResource(SDnode *pDnode) { dndCleanupTrans(pDnode); dndStopMgmt(pDnode); + dndCleanupMgmt(pDnode); tfsClose(pDnode->pTfs); dDebug("dnode object resource is cleared, data:%p", pDnode); } @@ -238,7 +239,6 @@ _OVER: // dndCleanupSnode(pDnode); // dndCleanupQnode(pDnode); // dndCleanupVnodes(pDnode); - // dndCleanupMgmt(pDnode); return pDnode; diff --git a/source/dnode/mgmt/dnode/src/dndMgmt.c b/source/dnode/mgmt/dnode/src/dndMgmt.c index 0276aa1564..880c4dd040 100644 --- a/source/dnode/mgmt/dnode/src/dndMgmt.c +++ b/source/dnode/mgmt/dnode/src/dndMgmt.c @@ -24,6 +24,8 @@ #include "dndWorker.h" #include "monitor.h" +#include "dndMonitor.h" + static void dndProcessMgmtQueue(SDnode *pDnode, SRpcMsg *pMsg); static int32_t dndReadDnodes(SDnode *pDnode); @@ -472,76 +474,6 @@ void dndProcessStartupReq(SDnode *pDnode, SRpcMsg *pReq) { rpcSendResponse(&rpcRsp); } -static void dndGetMonitorBasicInfo(SDnode *pDnode, SMonBasicInfo *pInfo) { - pInfo->dnode_id = dndGetDnodeId(pDnode); - tstrncpy(pInfo->dnode_ep, tsLocalEp, TSDB_EP_LEN); - pInfo->cluster_id = dndGetClusterId(pDnode); - pInfo->protocol = 1; -} - -static void dndGetMonitorDnodeInfo(SDnode *pDnode, SMonDnodeInfo *pInfo) { - pInfo->uptime = (taosGetTimestampMs() - pDnode->dmgmt.rebootTime) / (86400000.0f); - taosGetCpuUsage(&pInfo->cpu_engine, &pInfo->cpu_system); - pInfo->cpu_cores = tsNumOfCores; - taosGetProcMemory(&pInfo->mem_engine); - taosGetSysMemory(&pInfo->mem_system); - pInfo->mem_total = tsTotalMemoryKB; - pInfo->disk_engine = 0; - pInfo->disk_used = tsDataSpace.size.used; - pInfo->disk_total = tsDataSpace.size.total; - taosGetCardInfo(&pInfo->net_in, &pInfo->net_out); - taosGetProcIO(&pInfo->io_read, &pInfo->io_write, &pInfo->io_read_disk, &pInfo->io_write_disk); - - SVnodesStat *pStat = &pDnode->vmgmt.stat; - pInfo->req_select = pStat->numOfSelectReqs; - pInfo->req_insert = pStat->numOfInsertReqs; - pInfo->req_insert_success = pStat->numOfInsertSuccessReqs; - pInfo->req_insert_batch = pStat->numOfBatchInsertReqs; - pInfo->req_insert_batch_success = pStat->numOfBatchInsertSuccessReqs; - pInfo->errors = tsNumOfErrorLogs; - pInfo->vnodes_num = pStat->totalVnodes; - pInfo->masters = pStat->masterNum; - pInfo->has_mnode = pDnode->mmgmt.deployed; -} - -static void dndSendMonitorReport(SDnode *pDnode) { - if (!tsEnableMonitor || tsMonitorFqdn[0] == 0 || tsMonitorPort == 0) return; - dTrace("pDnode:%p, send monitor report to %s:%u", pDnode, tsMonitorFqdn, tsMonitorPort); - - SMonInfo *pMonitor = monCreateMonitorInfo(); - if (pMonitor == NULL) return; - - SMonBasicInfo basicInfo = {0}; - dndGetMonitorBasicInfo(pDnode, &basicInfo); - monSetBasicInfo(pMonitor, &basicInfo); - - SMonClusterInfo clusterInfo = {0}; - SMonVgroupInfo vgroupInfo = {0}; - SMonGrantInfo grantInfo = {0}; - if (mmGetMonitorInfo(pDnode, &clusterInfo, &vgroupInfo, &grantInfo) == 0) { - monSetClusterInfo(pMonitor, &clusterInfo); - monSetVgroupInfo(pMonitor, &vgroupInfo); - monSetGrantInfo(pMonitor, &grantInfo); - } - - SMonDnodeInfo dnodeInfo = {0}; - dndGetMonitorDnodeInfo(pDnode, &dnodeInfo); - monSetDnodeInfo(pMonitor, &dnodeInfo); - - SMonDiskInfo diskInfo = {0}; - if (dndGetMonitorDiskInfo(pDnode, &diskInfo) == 0) { - monSetDiskInfo(pMonitor, &diskInfo); - } - - taosArrayDestroy(clusterInfo.dnodes); - taosArrayDestroy(clusterInfo.mnodes); - taosArrayDestroy(vgroupInfo.vgroups); - taosArrayDestroy(diskInfo.datadirs); - - monSendReport(pMonitor); - monCleanupMonitorInfo(pMonitor); -} - static void *dnodeThreadRoutine(void *param) { SDnode *pDnode = param; SDnodeMgmt *pMgmt = &pDnode->dmgmt; diff --git a/source/dnode/mgmt/dnode/src/dndMonitor.c b/source/dnode/mgmt/dnode/src/dndMonitor.c index b5929427d9..54c6e384ab 100644 --- a/source/dnode/mgmt/dnode/src/dndMonitor.c +++ b/source/dnode/mgmt/dnode/src/dndMonitor.c @@ -16,7 +16,7 @@ #define _DEFAULT_SOURCE #include "dndMonitor.h" -int32_t dndGetMonitorDiskInfo(SDnode *pDnode, SMonDiskInfo *pInfo) { +static int32_t dndGetMonitorDiskInfo(SDnode *pDnode, SMonDiskInfo *pInfo) { tstrncpy(pInfo->logdir.name, tsLogDir, sizeof(pInfo->logdir.name)); pInfo->logdir.size = tsLogSpace.size; tstrncpy(pInfo->tempdir.name, tsTempDir, sizeof(pInfo->tempdir.name)); @@ -27,3 +27,75 @@ int32_t dndGetMonitorDiskInfo(SDnode *pDnode, SMonDiskInfo *pInfo) { } return 0; } + +static void dndGetMonitorBasicInfo(SDnode *pDnode, SMonBasicInfo *pInfo) { + pInfo->dnode_id = dndGetDnodeId(pDnode); + tstrncpy(pInfo->dnode_ep, tsLocalEp, TSDB_EP_LEN); + pInfo->cluster_id = dndGetClusterId(pDnode); + pInfo->protocol = 1; +} + +static void dndGetMonitorDnodeInfo(SDnode *pDnode, SMonDnodeInfo *pInfo) { + pInfo->uptime = (taosGetTimestampMs() - pDnode->dmgmt.rebootTime) / (86400000.0f); + taosGetCpuUsage(&pInfo->cpu_engine, &pInfo->cpu_system); + pInfo->cpu_cores = tsNumOfCores; + taosGetProcMemory(&pInfo->mem_engine); + taosGetSysMemory(&pInfo->mem_system); + pInfo->mem_total = tsTotalMemoryKB; + pInfo->disk_engine = 0; + pInfo->disk_used = tsDataSpace.size.used; + pInfo->disk_total = tsDataSpace.size.total; + taosGetCardInfo(&pInfo->net_in, &pInfo->net_out); + taosGetProcIO(&pInfo->io_read, &pInfo->io_write, &pInfo->io_read_disk, &pInfo->io_write_disk); + +#if 0 + SVnodesStat *pStat = &pDnode->vmgmt.stat; + pInfo->req_select = pStat->numOfSelectReqs; + pInfo->req_insert = pStat->numOfInsertReqs; + pInfo->req_insert_success = pStat->numOfInsertSuccessReqs; + pInfo->req_insert_batch = pStat->numOfBatchInsertReqs; + pInfo->req_insert_batch_success = pStat->numOfBatchInsertSuccessReqs; + pInfo->errors = tsNumOfErrorLogs; + pInfo->vnodes_num = pStat->totalVnodes; + pInfo->masters = pStat->masterNum; + pInfo->has_mnode = pDnode->mmgmt.deployed; +#endif +} + +void dndSendMonitorReport(SDnode *pDnode) { + if (!tsEnableMonitor || tsMonitorFqdn[0] == 0 || tsMonitorPort == 0) return; + dTrace("pDnode:%p, send monitor report to %s:%u", pDnode, tsMonitorFqdn, tsMonitorPort); + + SMonInfo *pMonitor = monCreateMonitorInfo(); + if (pMonitor == NULL) return; + + SMonBasicInfo basicInfo = {0}; + dndGetMonitorBasicInfo(pDnode, &basicInfo); + monSetBasicInfo(pMonitor, &basicInfo); + + SMonClusterInfo clusterInfo = {0}; + SMonVgroupInfo vgroupInfo = {0}; + SMonGrantInfo grantInfo = {0}; + if (mmGetMonitorInfo(pDnode, &clusterInfo, &vgroupInfo, &grantInfo) == 0) { + monSetClusterInfo(pMonitor, &clusterInfo); + monSetVgroupInfo(pMonitor, &vgroupInfo); + monSetGrantInfo(pMonitor, &grantInfo); + } + + SMonDnodeInfo dnodeInfo = {0}; + dndGetMonitorDnodeInfo(pDnode, &dnodeInfo); + monSetDnodeInfo(pMonitor, &dnodeInfo); + + SMonDiskInfo diskInfo = {0}; + if (dndGetMonitorDiskInfo(pDnode, &diskInfo) == 0) { + monSetDiskInfo(pMonitor, &diskInfo); + } + + taosArrayDestroy(clusterInfo.dnodes); + taosArrayDestroy(clusterInfo.mnodes); + taosArrayDestroy(vgroupInfo.vgroups); + taosArrayDestroy(diskInfo.datadirs); + + monSendReport(pMonitor); + monCleanupMonitorInfo(pMonitor); +} \ No newline at end of file diff --git a/source/dnode/mgmt/impl/src/dndTransport.c b/source/dnode/mgmt/dnode/src/dndTransport.c similarity index 100% rename from source/dnode/mgmt/impl/src/dndTransport.c rename to source/dnode/mgmt/dnode/src/dndTransport.c diff --git a/source/dnode/mgmt/impl/src/dndWorker.c b/source/dnode/mgmt/dnode/src/dndWorker.c similarity index 100% rename from source/dnode/mgmt/impl/src/dndWorker.c rename to source/dnode/mgmt/dnode/src/dndWorker.c diff --git a/source/dnode/mgmt/impl/CMakeLists.txt b/source/dnode/mgmt/impl/CMakeLists.txt deleted file mode 100644 index 9b81c5ecdc..0000000000 --- a/source/dnode/mgmt/impl/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -aux_source_directory(src DNODE_SRC) -aux_source_directory(mnodeMgmt/src DNODE_SRC) - -add_library(dnode STATIC ${DNODE_SRC}) -target_link_libraries( - dnode cjson mnode vnode qnode snode bnode wal sync taos tfs monitor -) -target_include_directories( - dnode - PUBLIC "${CMAKE_SOURCE_DIR}/include/dnode/mgmt" - PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" - PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/mnodeMgmt/inc" -) - -if(${BUILD_TEST}) - add_subdirectory(test) -endif(${BUILD_TEST}) \ No newline at end of file diff --git a/source/dnode/mgmt/impl/mnodeMgmt/inc/mm.h b/source/dnode/mgmt/mnode/inc/mm.h similarity index 100% rename from source/dnode/mgmt/impl/mnodeMgmt/inc/mm.h rename to source/dnode/mgmt/mnode/inc/mm.h diff --git a/source/dnode/mgmt/impl/mnodeMgmt/src/mmFile.c b/source/dnode/mgmt/mnode/src/mmFile.c similarity index 100% rename from source/dnode/mgmt/impl/mnodeMgmt/src/mmFile.c rename to source/dnode/mgmt/mnode/src/mmFile.c diff --git a/source/dnode/mgmt/impl/mnodeMgmt/src/mmHandle.c b/source/dnode/mgmt/mnode/src/mmHandle.c similarity index 100% rename from source/dnode/mgmt/impl/mnodeMgmt/src/mmHandle.c rename to source/dnode/mgmt/mnode/src/mmHandle.c diff --git a/source/dnode/mgmt/impl/mnodeMgmt/src/mmMgmt.c b/source/dnode/mgmt/mnode/src/mmMgmt.c similarity index 100% rename from source/dnode/mgmt/impl/mnodeMgmt/src/mmMgmt.c rename to source/dnode/mgmt/mnode/src/mmMgmt.c diff --git a/source/dnode/mgmt/impl/mnodeMgmt/src/mmWorker.c b/source/dnode/mgmt/mnode/src/mmWorker.c similarity index 100% rename from source/dnode/mgmt/impl/mnodeMgmt/src/mmWorker.c rename to source/dnode/mgmt/mnode/src/mmWorker.c diff --git a/source/dnode/mgmt/impl/src/dndQnode.c b/source/dnode/mgmt/qnode/inc/dndQnode.c similarity index 100% rename from source/dnode/mgmt/impl/src/dndQnode.c rename to source/dnode/mgmt/qnode/inc/dndQnode.c diff --git a/source/dnode/mgmt/impl/inc/dndQnode.h b/source/dnode/mgmt/qnode/src/dndQnode.h similarity index 100% rename from source/dnode/mgmt/impl/inc/dndQnode.h rename to source/dnode/mgmt/qnode/src/dndQnode.h diff --git a/source/dnode/mgmt/impl/inc/dndSnode.h b/source/dnode/mgmt/snode/inc/dndSnode.h similarity index 100% rename from source/dnode/mgmt/impl/inc/dndSnode.h rename to source/dnode/mgmt/snode/inc/dndSnode.h diff --git a/source/dnode/mgmt/impl/src/dndSnode.c b/source/dnode/mgmt/snode/src/dndSnode.c similarity index 100% rename from source/dnode/mgmt/impl/src/dndSnode.c rename to source/dnode/mgmt/snode/src/dndSnode.c diff --git a/source/dnode/mgmt/impl/inc/dndVnodes.h b/source/dnode/mgmt/vnode/inc/dndVnodes.h similarity index 100% rename from source/dnode/mgmt/impl/inc/dndVnodes.h rename to source/dnode/mgmt/vnode/inc/dndVnodes.h diff --git a/source/dnode/mgmt/impl/src/dndVnodes.c b/source/dnode/mgmt/vnode/src/dndVnodes.c similarity index 100% rename from source/dnode/mgmt/impl/src/dndVnodes.c rename to source/dnode/mgmt/vnode/src/dndVnodes.c -- GitLab