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 14:02:10 +08:00
parent 1408a331f1
commit 26b32bd9e7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -566,8 +566,8 @@ int32_t bnInit() {
void bnCleanUp() { void bnCleanUp() {
bnCleanupThread(); bnCleanupThread();
pthread_mutex_destroy(&tsBnMgmt.mutex);
bnCleanupDnodes(); bnCleanupDnodes();
pthread_mutex_destroy(&tsBnMgmt.mutex);
} }
int32_t bnDropDnode(SDnodeObj *pDnode) { int32_t bnDropDnode(SDnodeObj *pDnode) {

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

@ -81,7 +81,6 @@ void bnCleanupThread() {
} }
static void bnPostSignal() { static void bnPostSignal() {
mDebug("balance thread async notify");
pthread_mutex_lock(&tsBnThread.mutex); pthread_mutex_lock(&tsBnThread.mutex);
pthread_cond_signal(&tsBnThread.cond); pthread_cond_signal(&tsBnThread.cond);
pthread_mutex_unlock(&(tsBnThread.mutex)); pthread_mutex_unlock(&(tsBnThread.mutex));
@ -94,11 +93,13 @@ static void bnPostSignal() {
static void bnProcessTimer(void *handle, void *tmrId) { static void bnProcessTimer(void *handle, void *tmrId) {
if (!sdbIsMaster()) return; if (!sdbIsMaster()) return;
if (tsBnThread.stop) return;
tsBnThread.timer = NULL; tsBnThread.timer = NULL;
tsAccessSquence++; tsAccessSquence++;
bnCheckStatus(); bnCheckStatus();
bnStartTimer(-1);
if (handle == NULL) { if (handle == NULL) {
if (tsAccessSquence % tsBalanceInterval == 0) { if (tsAccessSquence % tsBalanceInterval == 0) {
@ -113,6 +114,8 @@ static void bnProcessTimer(void *handle, void *tmrId) {
} }
void bnStartTimer(int64_t mseconds) { void bnStartTimer(int64_t mseconds) {
if (tsBnThread.stop) return;
bool updateSoon = (mseconds != -1); bool updateSoon = (mseconds != -1);
if (updateSoon) { if (updateSoon) {
taosTmrReset(bnProcessTimer, mseconds, (void *)mseconds, tsMnodeTmr, &tsBnThread.timer); taosTmrReset(bnProcessTimer, mseconds, (void *)mseconds, tsMnodeTmr, &tsBnThread.timer);