xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

TD-2270

This commit is contained in:
Shengliang Guan 2020-12-03 13:19:28 +08:00
parent b39b84e6d8
commit 1993fbc480
4 changed files with 6 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/balance/inc/bnInt.h
View File

@ -13,13 +13,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef TDENGINE_BALANCE_MAIN_H #ifndef TDENGINE_BALANCE_INT_H
#define TDENGINE_BALANCE_MAIN_H #define TDENGINE_BALANCE_INT_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "mnodeInt.h" #include "mnodeInt.h"
#include "mnodeDef.h"
#include "mnodeDnode.h" #include "mnodeDnode.h"
typedef struct { typedef struct {

19
src/balance/src/bnMain.c
View File

@ -15,17 +15,12 @@
#define _DEFAULT_SOURCE #define _DEFAULT_SOURCE
#include "os.h" #include "os.h"
#include "tutil.h"
#include "tbalance.h"
#include "tsync.h" #include "tsync.h"
#include "ttimer.h"
#include "tglobal.h" #include "tglobal.h"
#include "tdataformat.h"
#include "dnode.h" #include "dnode.h"
#include "mnode.h" #include "bnInt.h"
#include "mnodeDef.h" #include "bnScore.h"
#include "mnodeInt.h" #include "bnThread.h"
#include "mnodeDnode.h"
#include "mnodeDb.h" #include "mnodeDb.h"
#include "mnodeMnode.h" #include "mnodeMnode.h"
#include "mnodeSdb.h" #include "mnodeSdb.h"
@ -33,12 +28,7 @@
#include "mnodeUser.h" #include "mnodeUser.h"
#include "mnodeVgroup.h" #include "mnodeVgroup.h"
#include "bnInt.h"
#include "bnScore.h"
#include "bnThread.h"
static SBnMgmt tsBnMgmt;; static SBnMgmt tsBnMgmt;;
static void bnMonitorDnodeModule(); static void bnMonitorDnodeModule();
static void bnLock() { static void bnLock() {
@ -514,7 +504,6 @@ bool bnStart() {
} }
bnReleaseDnodes(); bnReleaseDnodes();
bnUnLock(); bnUnLock();
return updateSoon; return updateSoon;
@ -610,8 +599,6 @@ int32_t bnDropDnode(SDnodeObj *pDnode) {
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
static void bnMonitorDnodeModule() { static void bnMonitorDnodeModule() {
int32_t numOfMnodes = mnodeGetMnodesNum(); int32_t numOfMnodes = mnodeGetMnodesNum();
if (numOfMnodes >= tsNumOfMnodes) return; if (numOfMnodes >= tsNumOfMnodes) return;

16
src/balance/src/bnScore.c
View File

@ -15,25 +15,9 @@
#define _DEFAULT_SOURCE #define _DEFAULT_SOURCE
#include "os.h" #include "os.h"
#include "tutil.h"
#include "tbalance.h"
#include "tsync.h"
#include "tsync.h"
#include "ttimer.h"
#include "tglobal.h" #include "tglobal.h"
#include "tdataformat.h"
#include "dnode.h"
#include "mnode.h"
#include "mnodeDef.h"
#include "mnodeInt.h"
#include "mnodeDnode.h"
#include "mnodeDb.h"
#include "mnodeMnode.h"
#include "mnodeSdb.h"
#include "mnodeShow.h" #include "mnodeShow.h"
#include "mnodeUser.h" #include "mnodeUser.h"
#include "mnodeVgroup.h"
#include "bnScore.h" #include "bnScore.h"
SBnDnodes tsBnDnodes; SBnDnodes tsBnDnodes;

17
src/balance/src/bnThread.c
View File

@ -15,26 +15,9 @@
#define _DEFAULT_SOURCE #define _DEFAULT_SOURCE
#include "os.h" #include "os.h"
#include "tutil.h"
#include "tbalance.h"
#include "tsync.h"
#include "tsync.h"
#include "ttimer.h" #include "ttimer.h"
#include "tglobal.h" #include "tglobal.h"
#include "tdataformat.h"
#include "dnode.h"
#include "mnode.h"
#include "mnodeDef.h"
#include "mnodeInt.h"
#include "mnodeDnode.h"
#include "mnodeDb.h"
#include "mnodeMnode.h"
#include "mnodeSdb.h" #include "mnodeSdb.h"
#include "mnodeShow.h"
#include "mnodeUser.h"
#include "mnodeVgroup.h"
#include "bnThread.h" #include "bnThread.h"
static SBnThread tsBnThread; static SBnThread tsBnThread;