hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[bug fix] fix core at TenantConfigUpdateTask::runTimerTask

Browse Source
This commit is contained in:
obdev
2024-02-08 08:04:10 +00:00
committed by ob-robot
parent aeb8bf2d2e
commit e9f0e97a5a
6 changed files with 221 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
deps/oblib/src/lib/task/ob_timer.cpp vendored
View File

@ -216,7 +216,7 @@ int ObTimer::schedule_task(ObTimerTask &task, const int64_t delay, const bool re
int ObTimer::insert_token(const Token &token)
{
int ret = OB_SUCCESS;
int32_t max_task_num= max_task_num_;
int64_t max_task_num= max_task_num_;
if (!is_inited_) {
ret = OB_NOT_INIT;
} else {
@ -250,34 +250,34 @@ int ObTimer::cancel_task(const ObTimerTask &task)
ObMonitor<Mutex>::Lock guard(monitor_);
if (!is_inited_) {
ret = OB_NOT_INIT;
} else {
if (&task == uncanceled_task_) {
} else if (&task == uncanceled_task_) {
// repeat cancel, do-nothing
} else if (&task == running_task_) {
} else {
if (&task == running_task_) {
if (uncanceled_task_ != NULL) {
ret = OB_ERR_UNEXPECTED;
} else {
ATOMIC_STORE(&const_cast<ObTimerTask&>(task).timer_, nullptr);
// the token corresponding to running_task_ has been removed in run1(),
// so no need remove here
uncanceled_task_ = &const_cast<ObTimerTask&>(task);
OB_LOG(INFO, "cancel task", KP(this), K_(thread_id), K(wakeup_time_), K(tasks_num_), K(task));
}
} else {
int64_t pos = -1;
for (int64_t i = 0; i < tasks_num_; ++i) {
if (&task == tokens_[i].task) {
pos = i;
break;
}
if (OB_SUCC(ret)) {
ATOMIC_STORE(&const_cast<ObTimerTask&>(task).timer_, nullptr);
// for any tokens_[i].task == &task, we need remove tokens_[i]
int64_t i = 0;
while(i < tasks_num_) {
if (tokens_[i].task == &task) {
if (i + 1 < tasks_num_) {
memmove(&tokens_[i], &tokens_[i + 1], sizeof(tokens_[0]) * (tasks_num_ - i - 1));
}
--tasks_num_;
OB_LOG(INFO, "cancel task", KP(this), K_(thread_id), K(wakeup_time_), K(tasks_num_), K(task));
} else {
++i;
}
}
if (-1 == pos) {
// not found, do-nothing
} else {
ATOMIC_STORE(&const_cast<ObTimerTask&>(task).timer_, nullptr);
memmove(&tokens_[pos], &tokens_[pos + 1],
sizeof(tokens_[0]) * (tasks_num_ - pos - 1));
--tasks_num_;
OB_LOG(INFO, "cancel task", KP(this), K_(thread_id), K(wakeup_time_), K(tasks_num_), K(task));
}
}
}
return ret;
@ -481,8 +481,8 @@ void ObTimer::run1()
void ObTimer::dump() const
{
for (int32_t i = 0; i < tasks_num_; ++i) {
printf("%d : %ld %ld %p\n", i, tokens_[i].scheduled_time, tokens_[i].delay, tokens_[i].task);
for (int64_t i = 0; i < tasks_num_; ++i) {
printf("%ld : %ld %ld %p\n", i, tokens_[i].scheduled_time, tokens_[i].delay, tokens_[i].task);
}
}

5
deps/oblib/src/lib/task/ob_timer.h vendored
View File

@ -89,7 +89,7 @@ public:
int cancel_task(const ObTimerTask &task);
int wait_task(const ObTimerTask &task);
void cancel_all();
int32_t get_tasks_num() const { return tasks_num_; }
int64_t get_tasks_num() const { return tasks_num_; }
void dump() const;
private:
struct Token
@ -100,7 +100,6 @@ private:
TO_STRING_KV(K(scheduled_time), K(delay), KP(task), KPC(task));
int64_t scheduled_time;
int64_t delay;
bool canceled_;
ObTimerTask *task;
};
int insert_token(const Token &token);
@ -109,7 +108,7 @@ private:
DISALLOW_COPY_AND_ASSIGN(ObTimer);
private:
const static int64_t ELAPSED_TIME_LOG_THREASHOLD = 10 * 60 * 1000 * 1000; // 10 mins
int32_t tasks_num_;
int64_t tasks_num_;
int64_t max_task_num_;
int64_t wakeup_time_;
bool is_inited_;