diff --git a/src/storage/blocksstable/ob_block_manager.cpp b/src/storage/blocksstable/ob_block_manager.cpp index a1fc41ac50..c532407e09 100644 --- a/src/storage/blocksstable/ob_block_manager.cpp +++ b/src/storage/blocksstable/ob_block_manager.cpp @@ -1552,6 +1552,8 @@ int ObBlockManager::extend_file_size_if_need() int64_t reserved_size = 4 * 1024 * 1024 * 1024L; //default RESERVED_DISK_SIZE -> 4G if (OB_ISNULL(io_device_)) { + ret = OB_NOT_INIT; + LOG_WARN("block manager hasn't inited", K(ret), KP(io_device_)); } else if (OB_FAIL(SLOGGERMGR.get_reserved_size(reserved_size))) { LOG_WARN("Fail to get reserved size", K(ret)); } else if (!check_can_be_extend(reserved_size)) { diff --git a/src/storage/blocksstable/ob_index_block_builder.cpp b/src/storage/blocksstable/ob_index_block_builder.cpp index d769e6b301..bff6c0464a 100644 --- a/src/storage/blocksstable/ob_index_block_builder.cpp +++ b/src/storage/blocksstable/ob_index_block_builder.cpp @@ -984,7 +984,7 @@ int ObSSTableIndexBuilder::parse_macro_header( if (OB_UNLIKELY(buf_size <= 0) || OB_ISNULL(buf)) { ret = OB_INVALID_ARGUMENT; STORAGE_LOG(WARN, "the argument is invalid", K(ret), K(buf_size), KP(buf)); - } else if (common_header.deserialize(buf, buf_size, pos)) { + } else if (OB_FAIL(common_header.deserialize(buf, buf_size, pos))) { STORAGE_LOG(WARN, "fail to deserialize common header", K(ret), K(buf_size), KP(buf), K(pos)); } else if (OB_FAIL(macro_header.deserialize(buf, buf_size, pos))) { STORAGE_LOG(WARN, "fail to deserialize macro header", K(ret), KP(buf), K(buf_size), K(pos)); diff --git a/src/storage/blocksstable/ob_sstable.cpp b/src/storage/blocksstable/ob_sstable.cpp index 9fb1bf7286..cd9e949876 100644 --- a/src/storage/blocksstable/ob_sstable.cpp +++ b/src/storage/blocksstable/ob_sstable.cpp @@ -1152,7 +1152,7 @@ void ObSSTable::dec_macro_ref() const } } iterator.reset(); - if (OB_FAIL(meta_handle.get_sstable_meta().get_macro_info().get_linked_block_iter(iterator))) { + if (OB_FAIL(meta_handle.get_sstable_meta().get_macro_info().get_linked_block_iter(iterator))) { // ignore ret LOG_ERROR("fail to get linked block iterator", K(ret), KPC(this)); } else { while (OB_SUCC(iterator.get_next_macro_id(macro_id))) { diff --git a/src/storage/blocksstable/ob_tmp_file_cache.cpp b/src/storage/blocksstable/ob_tmp_file_cache.cpp index 5c3adfc132..298757fa39 100644 --- a/src/storage/blocksstable/ob_tmp_file_cache.cpp +++ b/src/storage/blocksstable/ob_tmp_file_cache.cpp @@ -1483,7 +1483,7 @@ int ObTmpTenantMemBlockManager::exec_wait() OB_TMP_FILE_STORE.dec_block_cache_num(tenant_id_, 1); ObTaskController::get().allow_next_syslog(); STORAGE_LOG(INFO, "succeed to wash a block", K(block_id), K(macro_id), - "free_page_nums:", free_page_nums, K(t_mblk_map_.size())); + K(free_page_nums), K(t_mblk_map_.size())); } } } diff --git a/src/storage/ls/ob_ls_tablet_service.cpp b/src/storage/ls/ob_ls_tablet_service.cpp index 42196146a1..28c238beed 100755 --- a/src/storage/ls/ob_ls_tablet_service.cpp +++ b/src/storage/ls/ob_ls_tablet_service.cpp @@ -3671,7 +3671,8 @@ int ObLSTabletService::check_old_row_legitimacy( if (OB_TMP_FAIL(check_real_leader_for_4377_(run_ctx.store_ctx_.ls_id_))) { ret = tmp_ret; LOG_WARN("check real leader for 4377 found exception", K(ret), K(old_row), K(data_table)); - } else if (OB_TMP_FAIL(check_need_rollback_in_transfer_for_4377_(run_ctx.store_ctx_.mvcc_acc_ctx_.tx_desc_, + } else if (nullptr != run_ctx.store_ctx_.mvcc_acc_ctx_.tx_desc_ + && OB_TMP_FAIL(check_need_rollback_in_transfer_for_4377_(run_ctx.store_ctx_.mvcc_acc_ctx_.tx_desc_, data_tablet_handle))) { ret = tmp_ret; LOG_WARN("check need rollback in transfer for 4377 found exception", K(ret), K(old_row), K(data_table)); @@ -6267,6 +6268,7 @@ int ObLSTabletService::check_need_rollback_in_transfer_for_4377_(const transacti bool unused_committed_flag = false; if (OB_ISNULL(tx_desc)) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("tx_desc is null when check 4377", K(ret)); } else if (OB_FAIL(data_tablet_handle.get_obj()->ObITabletMdsInterface::get_latest_tablet_status( user_data, unused_committed_flag))) { diff --git a/src/storage/meta_mem/ob_tenant_meta_mem_mgr.cpp b/src/storage/meta_mem/ob_tenant_meta_mem_mgr.cpp index 99398841bd..d059b00ca8 100755 --- a/src/storage/meta_mem/ob_tenant_meta_mem_mgr.cpp +++ b/src/storage/meta_mem/ob_tenant_meta_mem_mgr.cpp @@ -1235,7 +1235,9 @@ int ObTenantMetaMemMgr::acquire_tablet_from_pool( ret = OB_INVALID_ARGUMENT; LOG_WARN("invalid argument", K(ret), K(key), K(type)); } else if (OB_FAIL(acquire_tablet(type, tablet_handle))) { - LOG_WARN("fail to acquire tablet", K(ret), K(type)); + if (OB_ALLOCATE_MEMORY_FAILED != ret) { + LOG_WARN("fail to acquire tablet", K(ret), K(type)); + } } else { tablet_handle.set_wash_priority(priority); LOG_DEBUG("acquire tablet from pool", K(tablet_handle)); @@ -1283,7 +1285,9 @@ int ObTenantMetaMemMgr::acquire_tablet( LOG_WARN("not supported to wash", K(ret), K(type)); } if (FAILEDx(meta_obj.pool_->alloc_obj(buf))) { - LOG_WARN("fail to acquire tablet buffer", K(ret)); + if (OB_ALLOCATE_MEMORY_FAILED != ret) { + LOG_WARN("fail to acquire tablet buffer", K(ret)); + } } else if (OB_ISNULL(buf)) { ret = OB_ERR_UNEXPECTED; LOG_WARN("tablet buffer is nullptr", K(ret), KP(buf)); @@ -2172,7 +2176,9 @@ int ObTenantMetaMemMgr::try_wash_tablet(const std::type_info &type_info, void *& SpinWLockGuard guard(wash_lock_); time_guard.click("wait_lock"); if (OB_FAIL(get_wash_tablet_candidate(type_info, info))) { - LOG_WARN("fail to get candidate tablet for wash", K(ret)); + if (OB_ITER_END != ret) { + LOG_WARN("fail to get candidate tablet for wash", K(ret)); + } } else { time_guard.click("get_candidate_cost"); if (OB_FAIL(do_wash_candidate_tablet(info, tablet_handle, free_obj))) { @@ -2183,7 +2189,7 @@ int ObTenantMetaMemMgr::try_wash_tablet(const std::type_info &type_info, void *& time_guard.click("wash_tablet"); } } - if (OB_SUCC(ret)) { + if (OB_SUCC(ret) || OB_ITER_END == ret) { if (OB_ISNULL(free_obj)) { LOG_WARN("no object can be washed", K(ret), K(is_large), "tablet count", tablet_map_.count(), K(tablet_buffer_pool_), K(large_tablet_buffer_pool_), diff --git a/src/storage/meta_mem/ob_tenant_meta_obj_pool.h b/src/storage/meta_mem/ob_tenant_meta_obj_pool.h index e67551c349..9786f4f18b 100644 --- a/src/storage/meta_mem/ob_tenant_meta_obj_pool.h +++ b/src/storage/meta_mem/ob_tenant_meta_obj_pool.h @@ -231,14 +231,18 @@ int ObTenantMetaObjPool::acquire(T *&t) ob_usleep(1); void *free_obj = nullptr; if (OB_FAIL((*wash_func_)(typeid(T), free_obj))) { - STORAGE_LOG(WARN, "wash function fail", K(ret)); + if (OB_ITER_END != ret) { + STORAGE_LOG(WARN, "wash function fail", K(ret)); + } } else { t = static_cast(free_obj); } } - if (OB_ISNULL(t)) { - ret = OB_ALLOCATE_MEMORY_FAILED; - STORAGE_LOG(WARN, "no object could be acquired", K(ret)); + if (OB_SUCC(ret) || OB_ITER_END == ret) { + if (OB_ISNULL(t)) { + ret = OB_ALLOCATE_MEMORY_FAILED; + STORAGE_LOG(DEBUG, "no object could be acquired", K(ret)); + } } } return ret;