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

fix core in get_next_ready_task

Browse Source
This commit is contained in:
a1iive
2023-01-11 11:08:06 +00:00
committed by ob-robot
parent eeb84455cc
commit 572870beed
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/share/scheduler/ob_dag_scheduler.cpp
View File

@ -671,14 +671,14 @@ int ObIDag::basic_init(const int64_t total,
const int64_t page_size)
{
int ret = OB_SUCCESS;
const lib::ObMemAttr mem_attr(MTL_ID(), ObModIds::OB_SCHEDULER);
if (is_inited_) {
ret = OB_INIT_TWICE;
COMMON_LOG(WARN, "dag init twice", K(ret));
} else if (OB_FAIL(allocator_.init(total, hold, page_size))) {
} else if (OB_FAIL(allocator_.init(lib::ObMallocAllocator::get_instance(), page_size,
mem_attr, 0, hold, total))) {
COMMON_LOG(WARN, "failed to init allocator", K(ret), K(total), K(hold), K(page_size));
} else {
allocator_.set_tenant_id(MTL_ID());
allocator_.set_label(ObModIds::OB_SCHEDULER);
is_inited_ = true;
}
return ret;
@ -1524,6 +1524,7 @@ int ObTenantDagScheduler::init(
const int64_t page_size /*= PAGE_SIZE*/)
{
int ret = OB_SUCCESS;
const lib::ObMemAttr mem_attr(tenant_id, ObModIds::OB_SCHEDULER);
if (IS_INIT) {
ret = OB_INIT_TWICE;
COMMON_LOG(WARN, "scheduler init twice", K(ret));
@ -1534,7 +1535,8 @@ int ObTenantDagScheduler::init(
ret = OB_INVALID_ARGUMENT;
COMMON_LOG(WARN, "init ObTenantDagScheduler with invalid arguments", K(ret), K(tenant_id), K(dag_limit),
K(total_mem_limit), K(hold_mem_limit), K(page_size));
} else if (OB_FAIL(allocator_.init(total_mem_limit, hold_mem_limit, page_size))) {
} else if (OB_FAIL(allocator_.init(lib::ObMallocAllocator::get_instance(), page_size,
mem_attr, 0, hold_mem_limit, total_mem_limit))) {
COMMON_LOG(WARN, "failed to init allocator", K(ret), K(total_mem_limit), K(hold_mem_limit),
K(page_size));
} else if (OB_FAIL(dag_map_.create(dag_limit, "DagMap", "DagNode", tenant_id))) {
@ -1549,8 +1551,6 @@ int ObTenantDagScheduler::init(
if (OB_SUCC(ret)) {
check_period_ = check_period;
loop_waiting_dag_list_period_ = loop_waiting_list_period;
allocator_.set_tenant_id(tenant_id);
allocator_.set_label(ObModIds::OB_SCHEDULER);
MEMSET(dag_cnts_, 0, sizeof(dag_cnts_));
MEMSET(dag_net_cnts_, 0, sizeof(dag_net_cnts_));
MEMSET(running_task_cnts_, 0, sizeof(running_task_cnts_));
@ -1626,7 +1626,7 @@ void ObTenantDagScheduler::destroy()
dag_net_id_map_.destroy();
}
allocator_.destroy();
allocator_.reset();
scheduler_sync_.destroy();
dag_cnt_ = 0;
dag_limit_ = 0;