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

[BUG.FIX] adjust check memory limit into query timeout

Browse Source
This commit is contained in:
Tyshawn
2023-07-19 07:47:59 +00:00
committed by ob-robot
parent 49ea0fd13e
commit a1855d1d6c
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/storage/blocksstable/ob_tmp_file_cache.cpp
View File

@ -1069,26 +1069,28 @@ int ObTmpTenantMemBlockManager::get_available_macro_block(const int64_t dir_id,
int ObTmpTenantMemBlockManager::check_memory_limit() int ObTmpTenantMemBlockManager::check_memory_limit()
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const int64_t timeout_ms = 120 * 1000; // 120s const int64_t timeout_ts = THIS_WORKER.get_timeout_ts();
while (OB_SUCC(ret) && get_tenant_mem_block_num() < t_mblk_map_.size()) { while (OB_SUCC(ret) && get_tenant_mem_block_num() < t_mblk_map_.size()) {
ObThreadCondGuard guard(cond_); ObThreadCondGuard guard(cond_);
if (OB_FAIL(guard.get_ret())) { if (OB_FAIL(guard.get_ret())) {
STORAGE_LOG(ERROR, "fail to guard request condition", K(ret)); STORAGE_LOG(ERROR, "fail to guard request condition", K(ret));
} else { } else {
int64_t wait_ms = timeout_ms; int64_t wait_ms = (timeout_ts - ObTimeUtility::current_time()) / 1000;
int64_t begin_us = ObTimeUtility::fast_current_time(); while (OB_SUCC(ret)
while (OB_SUCC(ret) && get_tenant_mem_block_num() < t_mblk_map_.size() && wait_ms > 0) { && get_tenant_mem_block_num() < t_mblk_map_.size()
&& !wait_info_queue_.is_empty()
&& wait_ms > 0) {
if (OB_FAIL(cond_.wait(wait_ms))) { if (OB_FAIL(cond_.wait(wait_ms))) {
STORAGE_LOG(WARN, "fail to wait block write condition", K(ret), K(wait_ms)); STORAGE_LOG(WARN, "fail to wait block write condition", K(ret), K(wait_ms));
} else if (get_tenant_mem_block_num() < t_mblk_map_.size()) { } else if (get_tenant_mem_block_num() < t_mblk_map_.size()) {
wait_ms = timeout_ms - (ObTimeUtility::fast_current_time() - begin_us) / 1000; wait_ms = (timeout_ts - ObTimeUtility::current_time()) / 1000;
} }
}
if (OB_SUCC(ret) && OB_UNLIKELY(wait_ms <= 0)) { if (OB_SUCC(ret) && OB_UNLIKELY(wait_ms <= 0)) {
ret = OB_TIMEOUT; ret = OB_TIMEOUT;
STORAGE_LOG(WARN, "fail to wait block io condition due to spurious wakeup", STORAGE_LOG(WARN, "fail to wait block io condition due to spurious wakeup",
K(ret), K(wait_ms)); K(ret), K(wait_ms), K(timeout_ts), K(ObTimeUtility::current_time()));
}
} }
} }
} }
@ -1482,9 +1484,6 @@ int ObTmpTenantMemBlockManager::exec_wait()
ret = OB_SUCCESS; ret = OB_SUCCESS;
} }
} }
if (OB_SUCC(ret) && OB_FAIL(cond_.broadcast())) {
STORAGE_LOG(ERROR, "signal wash condition failed", K(ret), K(block_id));
}
} }
} }
// no wait handle to process. // no wait handle to process.
@ -1494,6 +1493,12 @@ int ObTmpTenantMemBlockManager::exec_wait()
} }
} }
} }
if (OB_SUCC(ret) || OB_EAGAIN == ret) {
int tmp_ret = OB_SUCCESS;
if (OB_TMP_FAIL(cond_.broadcast())) {
STORAGE_LOG(ERROR, "signal wash condition failed", K(ret), K(tmp_ret));
}
}
return ret; return ret;
} }