diff --git a/deps/oblib/src/common/row/ob_row_store.h b/deps/oblib/src/common/row/ob_row_store.h index a2ea2b7e1c..1158a0cb10 100644 --- a/deps/oblib/src/common/row/ob_row_store.h +++ b/deps/oblib/src/common/row/ob_row_store.h @@ -302,6 +302,7 @@ int ObRowStore::append_row_store(const T &other_store) int64_t col_count = other_store.get_col_count(); ObObj *cell = NULL; if (OB_ISNULL(cell = static_cast(alloca(sizeof(ObObj) * col_count)))) { + ret = OB_ALLOCATE_MEMORY_FAILED; COMMON_LOG(WARN, "fail to alloc obj array", K(ret)); } else { cur_row.cells_ = cell; diff --git a/src/observer/virtual_table/ob_all_virtual_sys_stat.cpp b/src/observer/virtual_table/ob_all_virtual_sys_stat.cpp index 4d95f0c5d5..0f8325a286 100644 --- a/src/observer/virtual_table/ob_all_virtual_sys_stat.cpp +++ b/src/observer/virtual_table/ob_all_virtual_sys_stat.cpp @@ -203,7 +203,7 @@ int ObAllVirtualSysStat::update_all_stats_(const int64_t tenant_id, ObStatEventS int ret_bk = ret; if (NULL != GCTX.omt_) { double cpu_usage = .0; - if (!OB_FAIL(GCTX.omt_->get_tenant_cpu_usage(tenant_id, cpu_usage))) { + if (OB_SUCC(GCTX.omt_->get_tenant_cpu_usage(tenant_id, cpu_usage))) { stat_events.get(ObStatEventIds::CPU_USAGE - ObStatEventIds::STAT_EVENT_ADD_END -1)->stat_value_ = static_cast(cpu_usage * 100); stat_events.get(ObStatEventIds::MEMORY_USAGE - ObStatEventIds::STAT_EVENT_ADD_END -1)->stat_value_ @@ -215,7 +215,7 @@ int ObAllVirtualSysStat::update_all_stats_(const int64_t tenant_id, ObStatEventS } int64_t worker_time = 0; - if (!OB_FAIL(GCTX.omt_->get_tenant_worker_time(tenant_id, worker_time))) { + if (OB_SUCC(GCTX.omt_->get_tenant_worker_time(tenant_id, worker_time))) { stat_events.get(ObStatEventIds::WORKER_TIME - ObStatEventIds::STAT_EVENT_ADD_END -1)->stat_value_ = worker_time; } else { @@ -224,7 +224,7 @@ int ObAllVirtualSysStat::update_all_stats_(const int64_t tenant_id, ObStatEventS double min_cpu = .0; double max_cpu = .0; - if (!OB_FAIL(GCTX.omt_->get_tenant_cpu(tenant_id, min_cpu, max_cpu))) { + if (OB_SUCC(GCTX.omt_->get_tenant_cpu(tenant_id, min_cpu, max_cpu))) { stat_events.get(ObStatEventIds::MIN_CPUS - ObStatEventIds::STAT_EVENT_ADD_END -1)->stat_value_ = static_cast(min_cpu * 100); stat_events.get(ObStatEventIds::MAX_CPUS - ObStatEventIds::STAT_EVENT_ADD_END -1)->stat_value_ diff --git a/src/share/scheduler/ob_tenant_dag_scheduler.cpp b/src/share/scheduler/ob_tenant_dag_scheduler.cpp index ef5b99987e..665346e05a 100644 --- a/src/share/scheduler/ob_tenant_dag_scheduler.cpp +++ b/src/share/scheduler/ob_tenant_dag_scheduler.cpp @@ -564,7 +564,7 @@ int ObIDag::add_task(ObITask &task) if (OB_FAIL(check_cycle())) { COMMON_LOG(WARN, "check_cycle failed", K(ret), K_(id)); if (OB_ISNULL(task_list_.remove(&task))) { - COMMON_LOG(WARN, "failed to remove task from task_list", K_(id)); + COMMON_LOG_RET(ERROR, OB_ERR_UNEXPECTED, "failed to remove task from task_list", K_(id)); } } } @@ -594,7 +594,7 @@ int ObIDag::add_child(ObIDag &child) if (OB_UNLIKELY(nullptr != child.get_dag_net() && dag_net_ != child.get_dag_net())) { // already belongs to other dag_net ret = OB_INVALID_ARGUMENT; COMMON_LOG(WARN, "child's dag net is not null", K(ret), K(child), KP_(dag_net)); - } else if (child.deep_copy_children(get_child_nodes())) { // child is a new node, no concurrency + } else if (OB_FAIL(child.deep_copy_children(get_child_nodes()))) { // child is a new node, no concurrency COMMON_LOG(WARN, "failed to deep copy child", K(ret), K(child)); } else if (nullptr == child.get_dag_net() && OB_FAIL(dag_net_->add_dag_into_dag_net(child))) { COMMON_LOG(WARN, "failed to add dag into dag net", K(ret), K(child), KPC(dag_net_)); @@ -3706,7 +3706,7 @@ int ObDagNetScheduler::loop_running_dag_net_list() if (dag_net->is_started() && OB_TMP_FAIL(dag_net->schedule_rest_dag())) { LOG_WARN("failed to schedule rest dag", K(tmp_ret)); } else if (dag_net->check_finished_and_mark_stop()) { - LOG_WARN("dag net is in finish state, move to finished list", K(ret), KPC(dag_net)); + LOG_INFO("dag net is in finish state, move to finished list", K(ret), KPC(dag_net)); (void) erase_dag_net_list_or_abort(RUNNING_DAG_NET_LIST, dag_net); (void) add_dag_net_list_or_abort(FINISHED_DAG_NET_LIST, dag_net); } else if (dag_net->is_co_dag_net() diff --git a/src/sql/engine/basic/ob_pushdown_filter.cpp b/src/sql/engine/basic/ob_pushdown_filter.cpp index a28da4fe06..2e946d5697 100644 --- a/src/sql/engine/basic/ob_pushdown_filter.cpp +++ b/src/sql/engine/basic/ob_pushdown_filter.cpp @@ -505,7 +505,7 @@ int ObPushdownFilterConstructor::deduplicate_filter_node( --n_node; } } - if (0 < merged_node.count()) { + if (OB_SUCC(ret) && 0 < merged_node.count()) { if (OB_ISNULL(filter_nodes.at(i))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("filter node is null", K(ret), K(i)); diff --git a/src/storage/access/ob_micro_block_handle_mgr.cpp b/src/storage/access/ob_micro_block_handle_mgr.cpp index 5055a26384..5f8837be32 100644 --- a/src/storage/access/ob_micro_block_handle_mgr.cpp +++ b/src/storage/access/ob_micro_block_handle_mgr.cpp @@ -90,8 +90,8 @@ int ObMicroBlockDataHandle::get_micro_block_data( } else { try_release_loaded_block(); if (THIS_WORKER.get_timeout_remain() <= 0) { - // already timeout, don't retry - LOG_WARN("get data block data already timeout", K(ret), K(THIS_WORKER.get_timeout_remain())); + // already timeout, don't retry + LOG_INFO("get data block data already timeout", K(ret), K(THIS_WORKER.get_timeout_remain())); } else { //try sync io ObMicroBlockId micro_block_id; diff --git a/src/storage/blocksstable/index_block/ob_index_block_macro_iterator.cpp b/src/storage/blocksstable/index_block/ob_index_block_macro_iterator.cpp index 51840f1bdf..5c9b7eb1c0 100644 --- a/src/storage/blocksstable/index_block/ob_index_block_macro_iterator.cpp +++ b/src/storage/blocksstable/index_block/ob_index_block_macro_iterator.cpp @@ -60,7 +60,8 @@ int ObMicroIndexRowItem::init(ObIAllocator &allocator, } void *header_buf = nullptr; - if (OB_ISNULL(header_buf = allocator_->alloc(sizeof(ObIndexBlockRowHeader)))) { + if (OB_FAIL(ret)) { + } else if (OB_ISNULL(header_buf = allocator_->alloc(sizeof(ObIndexBlockRowHeader)))) { ret = OB_ALLOCATE_MEMORY_FAILED; LOG_WARN("allocate memory failed", K(ret), K(sizeof(ObIndexBlockRowHeader))); } else if (FALSE_IT(idx_row_header_ = new (header_buf) ObIndexBlockRowHeader())) { diff --git a/src/storage/blocksstable/ob_data_store_desc.cpp b/src/storage/blocksstable/ob_data_store_desc.cpp index efcaddf2be..80fa0c518d 100644 --- a/src/storage/blocksstable/ob_data_store_desc.cpp +++ b/src/storage/blocksstable/ob_data_store_desc.cpp @@ -322,7 +322,7 @@ int ObColDataStoreDesc::add_col_desc_from_cg_schema( if (OB_FAIL(col_desc_array_.init(column_cnt))) { STORAGE_LOG(WARN, "Failed to reserve column desc array", K(ret)); } else if (merge_schema.is_column_info_simplified()) { - if (merge_schema.get_mulit_version_rowkey_column_ids(multi_version_column_desc_array)) { + if (OB_FAIL(merge_schema.get_mulit_version_rowkey_column_ids(multi_version_column_desc_array))) { STORAGE_LOG(WARN, "failed to get rowkey column ids", K(ret), K(column_cnt), K(cg_schema), K(merge_schema)); } } else if (OB_FAIL(merge_schema.get_multi_version_column_descs(multi_version_column_desc_array))) { diff --git a/src/storage/blocksstable/ob_macro_block_reader.cpp b/src/storage/blocksstable/ob_macro_block_reader.cpp index 3547c4ab0f..f237ca13aa 100644 --- a/src/storage/blocksstable/ob_macro_block_reader.cpp +++ b/src/storage/blocksstable/ob_macro_block_reader.cpp @@ -270,7 +270,7 @@ int ObMacroBlockReader::decompress_data_with_prealloc_buf( } } - if (OB_FAIL(compressor_->decompress(buf, size, uncomp_buf, uncomp_buf_size, uncomp_size))) { + if (FAILEDx(compressor_->decompress(buf, size, uncomp_buf, uncomp_buf_size, uncomp_size))) { LOG_WARN("Fail to decompress data", K(ret)); } else { if (OB_UNLIKELY(uncomp_size != uncomp_buf_size)) { diff --git a/src/storage/compaction/ob_partition_merge_policy.cpp b/src/storage/compaction/ob_partition_merge_policy.cpp index b6935d7837..fb235d256a 100644 --- a/src/storage/compaction/ob_partition_merge_policy.cpp +++ b/src/storage/compaction/ob_partition_merge_policy.cpp @@ -573,7 +573,7 @@ int ObPartitionMergePolicy::find_minor_merge_tables( "last_end_log_ts", result.scn_range_.end_scn_, K(tmp_table_handle)); result.reset_handle_and_range(); } - if (OB_FAIL(result.handle_.add_table(tmp_table_handle))) { + if (FAILEDx(result.handle_.add_table(tmp_table_handle))) { LOG_WARN("Failed to add table", K(ret), KPC(table)); } else { if (1 == result.handle_.get_count()) { diff --git a/src/storage/compaction/ob_partition_merger.cpp b/src/storage/compaction/ob_partition_merger.cpp index e848d42dc8..c7d0afe11e 100644 --- a/src/storage/compaction/ob_partition_merger.cpp +++ b/src/storage/compaction/ob_partition_merger.cpp @@ -892,6 +892,7 @@ int ObPartitionMajorMerger::reuse_base_sstable(ObPartitionMergeHelper &merge_hel // flush all row in curr macro block while (OB_SUCC(ret) && base_iter->is_macro_block_opened()) { if (OB_ISNULL(base_iter->get_curr_row())) { + ret = OB_ERR_UNEXPECTED; STORAGE_LOG(WARN, "curr row is unexpected null", K(ret), KPC(base_iter)); } else if (OB_FAIL(process(*base_iter->get_curr_row()))) { STORAGE_LOG(WARN, "Failed to process row", K(ret), K(partition_fuser_->get_result_row())); @@ -1649,6 +1650,7 @@ void ObPartitionMergeDumper::print_error_info(const int err_no, ObITable *table = tables_handle.get_table(idx); ObITable *dump_table = nullptr; if (OB_ISNULL(table)) { + ret = OB_ERR_UNEXPECTED; STORAGE_LOG(WARN, "The store is NULL", K(idx), K(tables_handle)); } else if (OB_FAIL(compaction::ObPartitionMergeDumper::judge_disk_free_space(dump_table_dir, table))) { diff --git a/src/storage/compaction/ob_tenant_tablet_scheduler.cpp b/src/storage/compaction/ob_tenant_tablet_scheduler.cpp index 6f6c694eb7..efee1c329e 100644 --- a/src/storage/compaction/ob_tenant_tablet_scheduler.cpp +++ b/src/storage/compaction/ob_tenant_tablet_scheduler.cpp @@ -1760,7 +1760,7 @@ int ObTenantTabletScheduler::update_major_progress(const int64_t merge_version) LOG_WARN("failed to finish progress", KR(ret), K(merge_version)); } } - if (OB_FAIL(MTL(ObTenantCompactionProgressMgr *)->update_progress_status( + if (FAILEDx(MTL(ObTenantCompactionProgressMgr *)->update_progress_status( merge_version, share::ObIDag::DAG_STATUS_NODE_RUNNING))) { LOG_WARN("failed to update progress", KR(ret), K(merge_version)); } diff --git a/src/storage/ls/ob_ls_tablet_service.cpp b/src/storage/ls/ob_ls_tablet_service.cpp index a9c93b548e..a04246926b 100644 --- a/src/storage/ls/ob_ls_tablet_service.cpp +++ b/src/storage/ls/ob_ls_tablet_service.cpp @@ -4062,7 +4062,8 @@ int ObLSTabletService::insert_tablet_rows( // It would be more efficient and elegant to completely merge the uniqueness constraint // and write conflict checking, but the implementation currently is to minimize intrusion // into the memtable. - if (check_exists && OB_FAIL(tablet_handle.get_obj()->rowkeys_exists(run_ctx.store_ctx_, table, + if (OB_FAIL(ret)) { + } else if (check_exists && OB_FAIL(tablet_handle.get_obj()->rowkeys_exists(run_ctx.store_ctx_, table, rows_info, exists))) { LOG_WARN("Failed to check the uniqueness constraint", K(ret), K(rows_info)); } else if (exists) { diff --git a/src/storage/ob_table_store_stat_mgr.cpp b/src/storage/ob_table_store_stat_mgr.cpp index a2c9219a6b..2d2945a0b1 100644 --- a/src/storage/ob_table_store_stat_mgr.cpp +++ b/src/storage/ob_table_store_stat_mgr.cpp @@ -406,19 +406,19 @@ void ObTableStoreStatMgr::run_report_task() if (start == end) { // do nothing } else if (start < end) { - for (int64_t i = start; i < end; ++i) { + for (int64_t i = start; OB_SUCC(ret) && i < end; ++i) { if(OB_FAIL(add_stat(stat_queue_[i]))) { LOG_WARN("report stat fail", K(ret), K(i), K(stat_queue_[i])); } } ATOMIC_STORE(&report_cursor_, end); } else { - for (int64_t i = start; i < MAX_PENDDING_CNT - 1; ++i) { + for (int64_t i = start; OB_SUCC(ret) && i < MAX_PENDDING_CNT - 1; ++i) { if(OB_FAIL(add_stat(stat_queue_[i]))) { LOG_WARN("report stat fail", K(ret), K(i), K(stat_queue_[i])); } } - for (int64_t i = 0; i < end; ++i) { + for (int64_t i = 0; OB_SUCC(ret) && i < end; ++i) { if(OB_FAIL(add_stat(stat_queue_[i]))) { LOG_WARN("report stat fail", K(ret), K(i), K(stat_queue_[i])); } diff --git a/src/storage/tablet/ob_tablet_dumped_medium_info.cpp b/src/storage/tablet/ob_tablet_dumped_medium_info.cpp index 6dc64980bc..f21ac94bcc 100644 --- a/src/storage/tablet/ob_tablet_dumped_medium_info.cpp +++ b/src/storage/tablet/ob_tablet_dumped_medium_info.cpp @@ -143,6 +143,7 @@ int ObTabletDumpedMediumInfo::init_for_mds_table_dump( const compaction::ObMediumCompactionInfo *chosen_info = nullptr; if (OB_ISNULL(info1) || OB_ISNULL(info2)) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("medium info is null", K(ret), K(i), K(j), KP(info1), KP(info2)); } else if (info1->medium_snapshot_ < info2->medium_snapshot_) { chosen_info = info1; diff --git a/src/storage/tablet/ob_tablet_mds_data.cpp b/src/storage/tablet/ob_tablet_mds_data.cpp index ad95a10d92..9e90b8380f 100644 --- a/src/storage/tablet/ob_tablet_mds_data.cpp +++ b/src/storage/tablet/ob_tablet_mds_data.cpp @@ -915,6 +915,7 @@ int ObTabletMdsData::copy_medium_info_list( const compaction::ObMediumCompactionInfo *chosen_info = nullptr; if (OB_ISNULL(info1) || OB_ISNULL(info2)) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("medium info is null", K(ret), K(i), K(j), KP(info1), KP(info2)); } else if (info1->medium_snapshot_ < info2->medium_snapshot_) { chosen_info = info1;