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

lower level of create_worker log

Browse Source
This commit is contained in:
nroskill
2023-03-02 19:10:52 +00:00
committed by ob-robot
parent 7550f4ffc6
commit 10902c8c01
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/observer/omt/ob_tenant.cpp
View File

@ -336,7 +336,7 @@ int ObResourceGroup::acquire_more_worker(int64_t num, int64_t &succ_num)
while (OB_SUCC(ret) && need_num > succ_num) { while (OB_SUCC(ret) && need_num > succ_num) {
ObThWorker *w = nullptr; ObThWorker *w = nullptr;
if (OB_FAIL(create_worker(w, tenant_, group_id_, INT32_MAX, this))) { if (OB_FAIL(create_worker(w, tenant_, group_id_, INT32_MAX, this))) {
LOG_ERROR("create worker failed", K(ret)); LOG_WARN("create worker failed", K(ret));
} else if (!workers_.add_last(&w->worker_node_)) { } else if (!workers_.add_last(&w->worker_node_)) {
OB_ASSERT(false); OB_ASSERT(false);
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
@ -1381,7 +1381,7 @@ int ObTenant::acquire_level_worker(int64_t num, int64_t &succ_num, int32_t level
while (OB_SUCC(ret) && need_num > succ_num) { while (OB_SUCC(ret) && need_num > succ_num) {
ObThWorker *w = nullptr; ObThWorker *w = nullptr;
if (OB_FAIL(create_worker(w, this, 0, level))) { if (OB_FAIL(create_worker(w, this, 0, level))) {
LOG_ERROR("create worker failed", K(ret)); LOG_WARN("create worker failed", K(ret));
} else if (!nesting_workers_.add_last(&w->worker_node_)) { } else if (!nesting_workers_.add_last(&w->worker_node_)) {
OB_ASSERT(false); OB_ASSERT(false);
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
@ -1413,7 +1413,7 @@ int ObTenant::acquire_more_worker(int64_t num, int64_t &succ_num)
while (OB_SUCC(ret) && num > succ_num) { while (OB_SUCC(ret) && num > succ_num) {
ObThWorker *w = nullptr; ObThWorker *w = nullptr;
if (OB_FAIL(create_worker(w, this, 0, 0))) { if (OB_FAIL(create_worker(w, this, 0, 0))) {
LOG_ERROR("create worker failed", K(ret)); LOG_WARN("create worker failed", K(ret));
} else if (!workers_.add_last(&w->worker_node_)) { } else if (!workers_.add_last(&w->worker_node_)) {
OB_ASSERT(false); OB_ASSERT(false);
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;

4
src/observer/omt/ob_th_worker.cpp
View File

@ -50,8 +50,8 @@ int create_worker(ObThWorker* &worker, ObTenant *tenant, int32_t group_id,
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
if (tenant->total_worker_cnt() >= tenant->max_worker_cnt()) { if (tenant->total_worker_cnt() >= tenant->max_worker_cnt()) {
ret = OB_SIZE_OVERFLOW; ret = OB_RESOURCE_OUT;
LOG_ERROR("create worker fail", K(ret), K(tenant->id()), K(group_id), K(level), LOG_WARN("create worker fail", K(ret), K(tenant->id()), K(group_id), K(level),
K(tenant->total_worker_cnt()), K(tenant->max_worker_cnt())); K(tenant->total_worker_cnt()), K(tenant->max_worker_cnt()));
} else if (OB_ISNULL(worker = OB_NEW(ObThWorker, } else if (OB_ISNULL(worker = OB_NEW(ObThWorker,
ObMemAttr(0 == GET_TENANT_ID() ? OB_SERVER_TENANT_ID : GET_TENANT_ID(), ObMemAttr(0 == GET_TENANT_ID() ? OB_SERVER_TENANT_ID : GET_TENANT_ID(),