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

Merge pull request #4431 from taosdata/feature/wal 

crash while quit balance module
This commit is contained in:
Shengliang Guan 2020-12-03 23:28:32 +08:00 committed by GitHub
parent 9b0cbe50cb 12a6fb0499
commit f5afd5763d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,7 @@ static void *bnThreadFunc(void *arg) {
pthread_mutex_unlock(&(tsBnThread.mutex)); pthread_mutex_unlock(&(tsBnThread.mutex));
} }
mDebug("balance thread is stopped");
return NULL; return NULL;
} }
@ -47,7 +48,7 @@ int32_t bnInitThread() {
pthread_attr_t thattr; pthread_attr_t thattr;
pthread_attr_init(&thattr); pthread_attr_init(&thattr);
pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_DETACHED); pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
int32_t ret = pthread_create(&tsBnThread.thread, &thattr, bnThreadFunc, NULL); int32_t ret = pthread_create(&tsBnThread.thread, &thattr, bnThreadFunc, NULL);
pthread_attr_destroy(&thattr); pthread_attr_destroy(&thattr);
@ -81,6 +82,8 @@ void bnCleanupThread() {
} }
static void bnPostSignal() { static void bnPostSignal() {
if (tsBnThread.stop) return;
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));