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

[FEAT MERGE] Fix the error code loss and overwriting issues on the master branch

Browse Source 
Co-authored-by: jingtaoye35 <1255153887@qq.com>
Co-authored-by: fkuner <784819644@qq.com>
Co-authored-by: lucky-sinx <2549261744@qq.com>
This commit is contained in:
hwx65 2024-06-17 13:46:15 +00:00 committed by ob-robot
parent 020eae1d2b
commit da5aece3e1
266 changed files with 661 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/oblib/src/common/storage/ob_fd_simulator.cpp vendored
View File

@ -251,8 +251,10 @@ bool ObFdSimulator::validate_fd(const ObIOFd& fd, bool expect)
} else {
FdSlot *second_array = first_array_[first_id].second_array_p;
if (OB_ISNULL(second_array)) {
// ignore ret
OB_LOG(WARN, "fd maybe wrong, second fd array is null!", K(first_id), K(second_id), K(total_fd_cnt_), K(used_fd_cnt_));
} else if (second_array[second_id].slot_version != fd.second_id_){
} else if (second_array[second_id].slot_version != fd.second_id_) {
// ignore ret
OB_LOG(WARN, "fd slot_version is invalid, maybe double free!", K(first_id), K(fd.second_id_),
K(second_array[second_id].slot_version));
} else {

8
deps/oblib/src/lib/alloc/ob_malloc_allocator.cpp vendored
View File

@ -138,12 +138,12 @@ void *ObMallocAllocator::alloc(const int64_t size, const oceanbase::lib::ObMemAt
allocator = get_tenant_ctx_allocator(inner_attr.tenant_id_, inner_attr.ctx_id_);
}
}
int tmp_ret = OB_SUCCESS;
if (OB_ISNULL(allocator)) {
// ignore ret
ret = OB_ENTRY_NOT_EXIST;
tmp_ret = OB_ENTRY_NOT_EXIST;
ret = OB_SUCC(ret) ? tmp_ret : ret;
LOG_ERROR("tenant allocator not exist", K(inner_attr.tenant_id_), K(inner_attr.ctx_id_),
K(ret));
K(ret), K(tmp_ret));
}
if (OB_SUCC(ret)) {

9
deps/oblib/src/lib/charset/ob_charset.cpp vendored
View File

@ -878,6 +878,7 @@ uint64_t ObCharset::hash(ObCollationType collation_type,
ObCharsetInfo *cs = static_cast<ObCharsetInfo *>(ObCharset::charset_arr[collation_type]);
if (OB_ISNULL(cs->coll)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected error. invalid argument(s)", K(cs), K(cs->coll), K(lbt()));
} else {
seed = 0xc6a4a7935bd1e995;
@ -1105,11 +1106,13 @@ size_t ObCharset::max_bytes_charpos(const ObCollationType collation_type,
size_t ret = 0;
if (OB_UNLIKELY(collation_type <= CS_TYPE_INVALID ||
collation_type >= CS_TYPE_MAX) ||
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected error. invalid argument(s)", K(collation_type), K(lbt()));
} else {
ObCharsetInfo *cs = static_cast<ObCharsetInfo *>(ObCharset::charset_arr[collation_type]);
if (OB_ISNULL(cs->cset)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected error. invalid argument(s)", K(cs), K(cs->cset), K(lbt()));
} else {
size_t char_len_tmp = 0;
@ -1128,11 +1131,13 @@ bool ObCharset::wildcmp(ObCollationType collation_type,
bool ret = false;
if (OB_UNLIKELY(collation_type <= CS_TYPE_INVALID ||
collation_type >= CS_TYPE_MAX) ||
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected error. invalid argument(s)", K(collation_type), K(lbt()));
} else {
ObCharsetInfo *cs = static_cast<ObCharsetInfo *>(ObCharset::charset_arr[collation_type]);
if (OB_ISNULL(cs->coll)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected error. invalid argument(s)", K(cs), K(cs->coll), K(lbt()));
} else {
int tmp = cs->coll->wildcmp(cs, str.ptr(), str.ptr() + str.length(),

2
deps/oblib/src/lib/geo/ob_geo_utils.cpp vendored
View File

@ -122,7 +122,7 @@ int ObGeoTypeUtil::get_pg_reserved_prj4text(ObIAllocator *allocator, uint32_t sr
if (OB_SUCC(ret)) {
ObString prj4_tmp = ObString::make_string(tmp_buf);
if (OB_FAIL(OB_FAIL(ob_write_string(*allocator, prj4_tmp, prj4_param, true)))) {
if (OB_FAIL(ob_write_string(*allocator, prj4_tmp, prj4_param, true))) {
LOG_WARN("failed to write string to buffer", K(ret), K(srid));
}
}

15
deps/oblib/src/lib/mysqlclient/ob_mysql_connection_pool.cpp vendored
View File

@ -680,9 +680,10 @@ void ObMySQLConnectionPool::runTimerTask()
// - remove invalid server connection pool
// - close long idle connection
// - renew tenant_server_conn_pool_map
if (OB_FAIL(purge_connection_pool())) {
// ignore ret
LOG_ERROR("fail to update mysql connection pool", K(ret));
int tmp_ret = OB_SUCCESS;
if (OB_TMP_FAIL(purge_connection_pool())) {
ret = OB_SUCC(ret) ? tmp_ret : ret;
LOG_ERROR("fail to update mysql connection pool", K(ret), K(tmp_ret));
}
}
@ -936,11 +937,9 @@ int ObMySQLConnectionPool::renew_tenant_server_pool_map()
LOG_WARN("renew_tenant_server_pool_ failed", K(ret), K(tenant_id), K(tenant_idx), K(tenant_array));
}
} // end for tenant_array
if (OB_FAIL(purge_tenant_server_pool_map_(tenant_array))) {
//ignore ret
LOG_WARN("purge_tenant_server_pool_map_ failed, skip this error", K(ret), K(tenant_array));
ret = OB_SUCCESS;
int tmp_ret = OB_SUCCESS;
if (OB_TMP_FAIL(purge_tenant_server_pool_map_(tenant_array))) {
LOG_WARN("purge_tenant_server_pool_map_ failed, skip this error", K(ret), K(tmp_ret), K(tenant_array));
} else {
LOG_TRACE("renew tenant_server_conn_pool_map succ");
}

6
deps/oblib/src/lib/number/ob_number_v2.cpp vendored
View File

@ -4246,7 +4246,8 @@ int ObNumber::atan(ObNumber &value, ObIAllocator &allocator, const bool do_round
int64_t count = 0;
allocator_const1.free();
//taylor series: atan(x) = x-(x^3)/3+(x^5)/5-(x^7)/7+... when |x|<1
if (OB_FAIL(taylor_series.from(copy_this, allocator_iter2))) {
if (OB_FAIL(ret)) {
} else if (OB_FAIL(taylor_series.from(copy_this, allocator_iter2))) {
LOG_WARN("taylor series from copy_this failed", K(copy_this), K(taylor_series), K(ret));
} else if (OB_FAIL(copy_this.mul_v3(copy_this, doublex, allocator_doublex, true, false))) {
LOG_WARN("doublex = copy_this*copy_this failed", K(copy_this), K(doublex), K(ret));
@ -7589,7 +7590,8 @@ int ObNumberBuilder::build_hex_integer_(const char *str, const int64_t integer_s
LOG_WARN("integer part is longer than fmt str", K(ret), K(i), K(c_p));
}
int32_t dec_len = 0;
if (OB_FAIL(hex_to_dec_(hex_str, new_len, dec_str, dec_len))) {
if (OB_FAIL(ret)) {
} else if (OB_FAIL(hex_to_dec_(hex_str, new_len, dec_str, dec_len))) {
LOG_WARN("failed to hex_to_dec", K(ret));
}
i = dec_len - 1;

5
deps/oblib/src/lib/restore/cos/ob_cos_wrapper.cpp vendored
View File

@ -59,12 +59,13 @@ const int64_t OB_STORAGE_LIST_MAX_NUM = 1000;
//datetime formate : Tue, 09 Apr 2019 06:24:00 GMT
//time unit is second
static int64_t strtotime(const char *date_time)
static int64_t ob_strtotime(const char *date_time)
{
int64_t time = 0;
struct tm tm_time;
memset(&tm_time, 0, sizeof(struct tm));
if (NULL == strptime(date_time, "%a, %d %b %Y %H:%M:%S %Z", &tm_time)) {
// ignore ret
//skip set ret, for compat data formate
cos_warn_log("[COS]fail to transform time, time=%s\n", date_time);
} else {
@ -588,7 +589,7 @@ int ObCosWrapper::head_object_meta(
// get object last modified time
if (OB_SUCCESS != ret) {
} else if (NULL != (last_modified_ptr = (char*)apr_table_get(resp_headers, COS_LAST_MODIFIED))) {
meta.last_modified_ts_ = strtotime(last_modified_ptr);
meta.last_modified_ts_ = ob_strtotime(last_modified_ptr);
} else {
ret = OB_COS_ERROR;
cos_warn_log("[COS]fail to get last modified from apr table, something wrong unexpected, ret=%d.\n", ret);

6
deps/oblib/src/lib/restore/ob_storage_oss_base.cpp vendored
View File

@ -1766,7 +1766,7 @@ int ObStorageOssUtil::del_dir(const common::ObString &uri)
//datetime formate : Tue, 09 Apr 2019 06:24:00 GMT
//time unit is second
int ObStorageOssUtil::strtotime(const char *date_time, int64_t &time)
int ObStorageOssUtil::ob_strtotime(const char *date_time, int64_t &time)
{
int ret = OB_SUCCESS;
time = 0;
@ -1774,8 +1774,9 @@ int ObStorageOssUtil::strtotime(const char *date_time, int64_t &time)
memset(&tm_time, 0, sizeof(struct tm));
if (OB_ISNULL(date_time)) {
ret = OB_INVALID_ARGUMENT;
OB_LOG(WARN, "strtotime get invalid argument", K(ret), KP(date_time));
OB_LOG(WARN, "ob_strtotime get invalid argument", K(ret), KP(date_time));
} else if (OB_ISNULL(strptime(date_time, "%a, %d %b %Y %H:%M:%S %Z", &tm_time))) {
// ignore ret
//skip set ret, for compat data formate
OB_LOG(WARN, "failed to strptime", K(ret), K(*date_time));
} else {
@ -2158,6 +2159,7 @@ int ObStorageOssAppendWriter::do_write(const char *buf, const int64_t size, cons
int64_t cur_pos = -1;
char *append_pos_str = (char*)(apr_table_get(resp_headers, OSS_NEXT_APPEND_POSITION));
if (OB_ISNULL(append_pos_str)) {
// ignore ret
OB_LOG(WARN, "after append fail, current append pos is not found", K(ret));
} else if (OB_TMP_FAIL(c_str_to_int(append_pos_str, cur_pos))) {
OB_LOG(WARN, "after append fail, fail to get append pos",

2
deps/oblib/src/lib/restore/ob_storage_oss_base.h vendored
View File

@ -241,7 +241,7 @@ public:
virtual int is_tagging(const common::ObString &uri, bool &is_tagging);
virtual int del_unmerged_parts(const ObString &uri) override;
private:
int strtotime(const char *date_time, int64_t &time);
int ob_strtotime(const char *date_time, int64_t &time);
int tagging_object_(
const common::ObString &uri,
ObStorageOssBase &oss_base,

3
deps/oblib/src/lib/timezone/ob_timezone_util.cpp vendored
View File

@ -415,7 +415,8 @@ int ObTimezoneUtils::prepare_tz_info(TIME_ZONE_INFO &tz_info)
}
/* set maximum end_l as finisher */
revts[tz_info.revcnt] = end_l;
if(!(tz_info.revts = (my_time_t*)ob_malloc(sizeof(my_time_t) * (tz_info.revcnt + 1), "TimeZoneUtils"))
if (OB_FAIL(ret)) {
} else if(!(tz_info.revts = (my_time_t*)ob_malloc(sizeof(my_time_t) * (tz_info.revcnt + 1), "TimeZoneUtils"))
|| !(tz_info.revtis = (REVT_INFO*)ob_malloc(sizeof(REVT_INFO) * tz_info.revcnt, "TimeZoneUtils"))
){
OB_LOG(ERROR, "ob_malloc for tz_info.revts tz_info.revtis failed");

3
deps/oblib/src/lib/wide_integer/ob_wide_integer.cpp vendored
View File

@ -148,7 +148,8 @@ int ObDecimalIntConstValue::init_const_values(ObIAllocator &alloc, const lib::Ob
// init zero values
char *zero_buf = nullptr;
int buf_size = sizeof(int32_t) + sizeof(int64_t) + sizeof(int128_t) + sizeof(int256_t) + sizeof(int512_t);
if (OB_ISNULL(zero_buf = (char *)allocator.alloc(buf_size))) {
if (OB_FAIL(ret)) {
} else if (OB_ISNULL(zero_buf = (char *)allocator.alloc(buf_size))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
COMMON_LOG(WARN, "allocate memory failed", K(ret));
} else {

3
deps/oblib/src/lib/xml/ob_multi_mode_interface.cpp vendored
View File

@ -298,7 +298,8 @@ int ObIMulModeBase::print_attr(ObStringBuffer& x_buf, uint32_t format_flag)
is_mysql_key_only = true;
}
if (OB_FAIL(get_key(key))) {
if (OB_FAIL(ret)) {
} else if (OB_FAIL(get_key(key))) {
LOG_WARN("fail to print =\" in attr", K(ret));
} else if (OB_FAIL(get_value(value))) {
LOG_WARN("fail to print =\" in attr", K(ret));

2
deps/oblib/src/rpc/obmysql/ob_mysql_handler.cpp vendored
View File

@ -173,7 +173,7 @@ int ObMySQLHandler::process(easy_request_t *r)
OB_NOT_NULL(pkt.get_cdata()) &&
pkt.get_clen() > comment_header_len_ &&
memcmp(pkt.get_cdata(), comment_header_, 9) == comment_header_len_) {
if (OB_FAIL(OB_FAIL(parse_head_comment(pkt.get_cdata(), pkt.get_clen())))) {
if (OB_FAIL(parse_head_comment(pkt.get_cdata(), pkt.get_clen()))) {
LOG_WARN("failed to parse head comment", K(ObString(pkt.get_clen(), pkt.get_cdata())), K(ret));
} else {
// to resolve dead lock triggled by nested sql between ob cluster

6
deps/oblib/unittest/lib/restore/test_storage_oss.cpp vendored
View File

@ -135,7 +135,7 @@ TEST_F(TestStorageOss, test_oss_acl)
s = oss_get_object_meta(options, &bucket, &object, &resp_headers);
ASSERT_TRUE(s->code == 200);
modified_time_before = apr_table_get(resp_headers, "Last-Modified");
ossutil.strtotime(modified_time_before, time_before);
ossutil.ob_strtotime(modified_time_before, time_before);
const char *modified_time_after = NULL;
int64_t time_after = 0;
@ -148,7 +148,7 @@ TEST_F(TestStorageOss, test_oss_acl)
s = oss_get_object_meta(options, &bucket, &object, &resp_headers);
ASSERT_TRUE(s->code == 200);
modified_time_after = apr_table_get(resp_headers, "Last-Modified");
ossutil.strtotime(modified_time_after, time_after);
ossutil.ob_strtotime(modified_time_after, time_after);
ASSERT_TRUE(time_before < time_after);
@ -170,7 +170,7 @@ TEST_F(TestStorageOss, test_oss_acl)
s = oss_get_object_meta(options, &bucket, &object, &resp_headers);
ASSERT_TRUE(s->code == 200);
modified_after_again = apr_table_get(resp_headers, "Last-Modified");
ossutil.strtotime(modified_after_again, time_after_again);
ossutil.ob_strtotime(modified_after_again, time_after_again);
ASSERT_TRUE(time_after < time_after_again);

1
mittest/simple_server/rewrite_function_for_test_big_tx_data.cpp
View File

@ -202,6 +202,7 @@ int ObTxDataSingleRowGetter::deserialize_tx_data_from_store_buffers_(ObTxData &t
char *merge_buffer = (char*)DEFAULT_TX_DATA_ALLOCATOR.alloc(total_buffer_size);
int64_t pos = 0;
if (OB_ISNULL(merge_buffer)) {
ret = OB_ERR_UNEXPECTED;
STORAGE_LOG(ERROR, "fail to alloc merge buffer", KR(ret), K(total_buffer_size));
} else {
char *p_dest = merge_buffer;

2
src/logservice/archiveservice/ob_ls_meta_recorder.cpp
View File

@ -58,7 +58,7 @@
share::SCN scn; \
share::ObBackupPath path; \
const share::ObLSID &id = array.at(i); \
if (OB_FAIL(OB_FAIL(t.get_data(id, archive_start_scn, buf_ + COMMON_HEADER_SIZE, MAX_META_RECORD_DATA_SIZE, real_size, scn)))) { \
if (OB_FAIL(t.get_data(id, archive_start_scn, buf_ + COMMON_HEADER_SIZE, MAX_META_RECORD_DATA_SIZE, real_size, scn))) { \
ARCHIVE_LOG(WARN, "get data failed", K(ret)); \
} else if (OB_UNLIKELY(! scn.is_valid())) { \
ARCHIVE_LOG(WARN, "scn is invalid", K(ret), K(task_type), K(scn)); \

1
src/logservice/cdcservice/ob_cdc_service.cpp
View File

@ -40,6 +40,7 @@ bool ExpiredArchiveClientLSFunctor::operator()(const ClientLSKey &key, ClientLSC
int ret = OB_SUCCESS;
bool bret = true;
if (OB_ISNULL(value)) {
// ignore ret
EXTLOG_LOG(WARN, "get null clientls ctx", K(key));
} else {
const FetchMode fetch_mode = value->get_fetch_mode();

1
src/logservice/data_dictionary/ob_data_dict_storager.cpp
View File

@ -721,6 +721,7 @@ void ObDataDictStorage::reset_cb_queue_()
while (! cb_queue_.empty()) {
QLink *item = NULL;
if (OB_ISNULL(item = cb_queue_.pop())) {
ret = OB_ERR_UNEXPECTED;
DDLOG(WARN, "pop item from data_dict_meta persist_callback_queue failed", KR(ret));
} else {
allocator_.free(item);

2
src/logservice/leader_coordinator/election_priority_impl/election_priority_v1.cpp
View File

@ -102,6 +102,7 @@ int PriorityV1::get_scn_(const share::ObLSID &ls_id, SCN &scn)
int64_t unused_pid = -1;
const bool is_cluster_already_4200 = GET_MIN_CLUSTER_VERSION() >= CLUSTER_VERSION_4_2_0_0;
if (OB_ISNULL(log_service)) {
ret = OB_ERR_UNEXPECTED;
COORDINATOR_LOG_(ERROR, "ObLogService is nullptr");
} else if (CLICK_FAIL(log_service->open_palf(ls_id, palf_handle_guard))) {
COORDINATOR_LOG_(WARN, "open_palf failed");
@ -189,6 +190,7 @@ int PriorityV1::get_role_(const share::ObLSID &ls_id, common::ObRole &role) cons
role = FOLLOWER;
if (OB_ISNULL(ls_srv)) {
ret = OB_ERR_UNEXPECTED;
COORDINATOR_LOG_(ERROR, "ObLSService is nullptr");
} else if (OB_FAIL(ls_srv->get_ls(ls_id, ls_handle, ObLSGetMod::LOG_MOD))) {
COORDINATOR_LOG_(WARN, "get_ls failed", K(ls_id));

1
src/logservice/libobcdc/src/ob_cdc_server_endpoint_access_info.cpp
View File

@ -107,6 +107,7 @@ ObAddr ObCDCEndpoint::get_addr() const
char *address;
if (OB_ISNULL(address = obsys::ObNetUtil::get_addr_by_hostname(host_))) {
// ignore ret
LOG_WARN("invalid addr of hostname", KPC(this));
} else {
addr.set_ip_addr(address, port_);

2
src/logservice/libobcdc/src/ob_cdc_tenant_endpoint_provider.cpp
View File

@ -166,7 +166,7 @@ int ObCDCEndpointProvider::parse_tenant_endpoint_list_(const char *tenant_endpoi
}
SpinWLockGuard guard(refresh_lock_);
if (OB_FAIL(endpoint_list_.assign(endpoint_list))) {
if (FAILEDx(endpoint_list_.assign(endpoint_list))) {
LOG_ERROR("assign endpoint_list failed", KR(ret),
"expected_endpoint_list", endpoint_list,
"cur_endpoint_list", endpoint_list_);

1
src/logservice/libobcdc/src/ob_log_fetch_log_rpc.cpp
View File

@ -989,6 +989,7 @@ void FetchLogARpc::clear_result_()
if (res_queue_.count() > 0) {
// Require result_pool_ be valid
if (OB_ISNULL(result_pool_)) {
// ignore ret
LOG_ERROR("invalid rpc result pool, can not clear results", K(result_pool_));
} else {
while (OB_SUCC(res_queue_.pop(data))) {

6
src/logservice/libobcdc/src/ob_log_meta_data_struct.cpp
View File

@ -115,7 +115,8 @@ int ObDictTenantInfo::alloc_dict_db_meta(datadict::ObDictDatabaseMeta *&dict_db_
ret = OB_NOT_INIT;
LOG_ERROR("ObDictTenantInfo has not been initialized", KR(ret));
} else if (OB_ISNULL(dict_db_meta = static_cast<datadict::ObDictDatabaseMeta *>(
cfifo_allocator_.alloc(sizeof(datadict::ObDictDatabaseMeta))))) {
cfifo_allocator_.alloc(sizeof(datadict::ObDictDatabaseMeta))))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_ERROR("allocate dict_db_meta failed", KR(ret), K(dict_db_meta));
} else {
new (dict_db_meta) datadict::ObDictDatabaseMeta(&arena_allocator_);
@ -252,7 +253,8 @@ int ObDictTenantInfo::alloc_dict_table_meta(datadict::ObDictTableMeta *&dict_tab
ret = OB_NOT_INIT;
LOG_ERROR("ObDictTenantInfo has not been initialized", KR(ret));
} else if (OB_ISNULL(dict_table_meta = static_cast<datadict::ObDictTableMeta *>(
cfifo_allocator_.alloc(sizeof(datadict::ObDictTableMeta))))) {
cfifo_allocator_.alloc(sizeof(datadict::ObDictTableMeta))))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_ERROR("allocate dict_table_meta failed", KR(ret), K(dict_table_meta));
} else {
new (dict_table_meta) datadict::ObDictTableMeta(&arena_allocator_);

4
src/logservice/libobcdc/src/ob_log_meta_manager.cpp
View File

@ -1462,7 +1462,7 @@ int ObLogMetaManager::fill_primary_key_info_(
"column_name", column_table_schema->get_column_name());
} else if (valid_pk_num > 0 && OB_FAIL(pks.append(","))) {
LOG_ERROR("append pks delimeter failed", KR(ret), K(valid_pk_num), K(pks));
} else if (pks.append(column_table_schema->get_column_name())) {
} else if (OB_FAIL(pks.append(column_table_schema->get_column_name()))) {
LOG_ERROR("append column_name into pks failed", KR(ret), K(pks), KPC(column_table_schema));
} else {
if (OB_SUCC(ret)) {
@ -1784,11 +1784,11 @@ int ObLogMetaManager::set_unique_keys_(ITableMeta *table_meta,
const auto *column_schema = table_schema->get_column_schema(column_id);
if (OB_ISNULL(column_schema)) {
ret = OB_ERR_UNEXPECTED;
LOG_ERROR("get column schema fail", K(column_id), K(index), K(column_count),
"table_id", table_schema->get_table_id(),
"table_name", table_schema->get_table_name(),
"table_schame_version", table_schema->get_schema_version());
ret = OB_ERR_UNEXPECTED;
} else {
if (is_first_uk_column) {
is_first_uk_column = false;

3
src/logservice/libobcdc/src/ob_log_part_trans_dispatcher.cpp
View File

@ -172,8 +172,7 @@ int PartTransDispatcher::dispatch_part_trans_task_(PartTransTask &task, volatile
// not have a corresponding guarantee. Therefore, it is normal for data progress to be rolled back here. But it is
// dangerous. This problem can only be completely solved when the schema is split within the tenant.
if (OB_UNLIKELY(prepare_ts < last_dispatch_progress_)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("partition dispatch progress is rollback, we should check it", KR(ret),
LOG_WARN_RET(OB_ERR_UNEXPECTED, "partition dispatch progress is rollback, we should check it",
K_(tls_id),
"prepare_ts", NTS_TO_STR(prepare_ts),
"prepare_lsn", prepare_lsn,

1
src/logservice/libobcdc/src/ob_log_reader.cpp
View File

@ -301,6 +301,7 @@ int ObLogReader::read_store_service_(ObLogEntryTask &log_entry_task,
}
} else {
if (OB_ISNULL(data_buf = static_cast<char *>(log_entry_task.alloc(value_len + 1)))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_ERROR("ReadLogBufFactory alloc fail", KR(ret));
} else {
MEMCPY(data_buf, value_str, value_len);

2
src/logservice/libobcdc/src/ob_log_resource_collector.cpp
View File

@ -590,7 +590,7 @@ int ObLogResourceCollector::handle(void *data,
if (OB_ISNULL(task)) {
LOG_ERROR("ObLogBR task is NULL");
ret = OB_ERR_UNEXPECTED;
} else if (task->get_record_type(record_type)) {
} else if (OB_FAIL(task->get_record_type(record_type))) {
LOG_ERROR("ObLogBR task get_record_type fail", KR(ret));
} else {
if (HEARTBEAT == record_type || EBEGIN == record_type || ECOMMIT == record_type) {

1
src/logservice/libobcdc/src/ob_log_tenant.cpp
View File

@ -958,6 +958,7 @@ void ObLogTenant::flush_storage()
}
if (OB_FAIL(store_service->flush(redo_cf_handle_))) {
// overwrite ret
LOG_WARN("flush tenant redo_column_family failed", KR(ret), K_(tenant_id));
} else {
LOG_INFO("flush tenant redo column_family succ", K_(tenant_id));

4
src/logservice/libobcdc/src/ob_log_timezone_info_getter.cpp
View File

@ -34,8 +34,8 @@ int ObCDCTenantTimeZoneInfo::init(const uint64_t tenant_id)
if (IS_INIT) {
ret = OB_INIT_TWICE;
LOG_ERROR("oblog_tz_info already inited", KR(ret), K(tenant_id));
} else if (OB_FAIL(OB_FAIL(
tz_info_map_.init(ObMemAttr(OB_SERVER_TENANT_ID, ObModIds::OB_HASH_BUCKET_TIME_ZONE_INFO_MAP))))) {
} else if (OB_FAIL(
tz_info_map_.init(ObMemAttr(OB_SERVER_TENANT_ID, ObModIds::OB_HASH_BUCKET_TIME_ZONE_INFO_MAP)))) {
// must use OB_SERVER_TENANT_ID cause alloc memory require user tenant should has its own ObMallocAllocator
LOG_ERROR("init tz_info_map_ failed", KR(ret), K(tenant_id));
} else {

4
src/logservice/logrouteservice/ob_log_route_service.cpp
View File

@ -738,13 +738,13 @@ int ObLogRouteService::add_into_blacklist(
} else if (OB_ISNULL(router_value)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("router_value is nullptr", KR(ret));
} else if (router_value->add_into_blacklist(router_key, svr, svr_service_time,
} else if (OB_FAIL(router_value->add_into_blacklist(router_key, svr, svr_service_time,
ATOMIC_LOAD(&blacklist_survival_time_sec_),
ATOMIC_LOAD(&blacklist_survival_time_upper_limit_min_),
ATOMIC_LOAD(&blacklist_survival_time_penalty_period_min_),
ATOMIC_LOAD(&blacklist_history_overdue_time_min_),
ATOMIC_LOAD(&blacklist_history_clear_interval_min_),
survival_time)) {
survival_time))) {
LOG_WARN("router_value add_into_blacklist failed", KR(ret), K(router_key), K(svr),
K(svr_service_time), K(survival_time));
} else {}

4
src/logservice/ob_garbage_collector.cpp
View File

@ -1675,7 +1675,8 @@ void ObGarbageCollector::gc_check_ls_status_(ObGCCandidateArray &gc_candidates)
CLOG_LOG(WARN, "get next log stream failed", K(ret));
}
} else if (OB_ISNULL(ls)) {
CLOG_LOG(ERROR, "log stream is NULL", KP(ls));
ret = OB_ERR_UNEXPECTED;
CLOG_LOG(ERROR, "log stream is NULL", K(ret), KP(ls));
} else if (OB_UNLIKELY(!ls->is_create_committed())) {
CLOG_LOG(INFO, "ls is not committed, just ignore", K(ls));
} else if (OB_SUCCESS != (tmp_ret = gc_check_ls_status_(*ls, gc_candidates))) {
@ -1801,6 +1802,7 @@ void ObGarbageCollector::execute_gc_(ObGCCandidateArray &gc_candidates)
} else if (NOT_IN_LEADER_MEMBER_LIST == gc_reason) {
ObLogHandler *log_handler = NULL;
if (OB_ISNULL(log_handler = ls->get_log_handler())) {
tmp_ret = OB_ERR_UNEXPECTED;
CLOG_LOG(ERROR, "log_handler is NULL", K(tmp_ret), K(id));
} else if (!log_handler->is_sync_enabled() || !log_handler->is_replay_enabled()) {
gc_handler->set_log_sync_stopped();

1
src/logservice/palf/election/algorithm/election_acceptor.cpp
View File

@ -235,6 +235,7 @@ void ElectionAcceptor::on_prepare_request(const ElectionPrepareRequestMsg &prepa
// 0. 收到leader prepare的时候无须比较优先级，直接返回投票结果
if (prepare_req.get_role() == common::ObRole::LEADER) {
if (prepare_req.get_ballot_number() <= ballot_number_) {
// ignore ret
LOG_PHASE(WARN, phase, "leader prepare message's ballot number is smaller than self");
} else {
advance_ballot_number_and_reset_related_states_(prepare_req.get_ballot_number(), phase);

1
src/logservice/palf/election/algorithm/election_proposer.cpp
View File

@ -54,6 +54,7 @@ struct ResponseChecker
proposer->advance_ballot_number_and_reset_related_states_(msg.get_ballot_number(),
"receive reject message");
if (proposer->check_leader()) {
// ignore ret
// 在check leader后可能卡住，做leader prepare时就已经不再是leader了
// 但是没有关系，正确性是由prepare阶段保证的，check_leader的意义在于尽量避免无谓的leader prepare流程
LOG_PHASE(WARN, phase, "leader message is rejected cause ballot number", K(msg.get_ballot_number()), K(proposer->prepare_success_ballot_));

1
src/logservice/palf/election/utils/election_event_recorder.cpp
View File

@ -248,6 +248,7 @@ int EventRecorder::report_member_list_changed_event(const MemberList &old_list,
int64_t pos = 0;
bool last_print_flag = false;
if (old_list.only_membership_version_different(new_list)) {
ret = OB_ERR_UNEXPECTED;
LOG_EVENT(ERROR, "only membership version different");
} else {
DO_IF_SUCC(databuff_printf(info, INFO_MAX_LEN, pos, "new : "));

2
src/logservice/palf/fetch_log_engine.cpp
View File

@ -332,8 +332,10 @@ void FetchLogEngine::handle_drop(void *task)
int ret = OB_SUCCESS;
IPalfHandleImpl *palf_handle_impl = NULL;
if (!is_inited_) {
ret = OB_NOT_INIT;
PALF_LOG(WARN, "FetchLogEngine not init");
} else if (OB_ISNULL(task)) {
ret = OB_ERR_UNEXPECTED;
PALF_LOG(WARN, "invalid argument", KP(task));
} else {
FetchLogTask *fetch_log_task = static_cast<FetchLogTask *>(task);

4
src/logservice/palf/log_config_mgr.cpp
View File

@ -2970,7 +2970,7 @@ int LogConfigMgr::handle_learner_keepalive_resp(const LogLearner &child)
// 2. guarantee regions of children are unique
// for follower:
// 2. guarantee regions of children are same with region_
int LogConfigMgr::check_children_health()
void LogConfigMgr::check_children_health()
{
int ret = OB_SUCCESS;
LogLearnerList dead_children;
@ -3013,6 +3013,7 @@ int LogConfigMgr::check_children_health()
}
// 5. retire removed children
if (OB_FAIL(submit_retire_children_req_(dead_children, RetireChildReason::CHILD_NOT_ALIVE))) {
// overwrite ret
PALF_LOG(WARN, "submit_retire_children_req failed", KR(ret), K_(palf_id), K_(self), K(dead_children));
} else if (!is_leader && OB_FAIL(submit_retire_children_req_(diff_region_children,
RetireChildReason::DIFFERENT_REGION_WITH_PARENT))) {
@ -3022,7 +3023,6 @@ int LogConfigMgr::check_children_health()
PALF_LOG(WARN, "submit_retire_children_req failed", KR(ret), K_(palf_id), K_(self), K(dup_region_children));
}
}
return ret;
}
int LogConfigMgr::remove_timeout_child_(LogLearnerList &dead_children)

2
src/logservice/palf/log_config_mgr.h
View File

@ -500,7 +500,7 @@ public:
int handle_register_parent_req(const LogLearner &child, const bool is_to_leader);
int handle_retire_parent(const LogLearner &child);
int handle_learner_keepalive_resp(const LogLearner &child);
int check_children_health();
void check_children_health();
// ==================== Parent ========================
int64_t to_string(char* buf, const int64_t buf_len) const
{

3
src/logservice/palf/palf_handle_impl.cpp
View File

@ -2650,6 +2650,7 @@ int PalfHandleImpl::check_and_switch_state()
do {
RLockGuard guard(lock_);
if (OB_FAIL(config_mgr_.leader_do_loop_work(config_state_changed))) {
// overwrite ret
PALF_LOG(WARN, "LogConfigMgr::leader_do_loop_work failed", KR(ret), K_(self), K_(palf_id));
} else if (OB_FAIL(mode_mgr_.leader_do_loop_work())) {
PALF_LOG(WARN, "LogModeMgr::leader_do_loop_work failed", KR(ret), K_(self), K_(palf_id));
@ -2659,6 +2660,7 @@ int PalfHandleImpl::check_and_switch_state()
if (OB_UNLIKELY(config_state_changed)) {
WLockGuard guard(lock_);
if (OB_FAIL(config_mgr_.switch_state())) {
// overwrite ret
PALF_LOG(WARN, "switch_state failed", K(ret));
}
}
@ -2683,6 +2685,7 @@ int PalfHandleImpl::check_and_switch_state()
}
if (palf_reach_time_interval(PALF_UPDATE_REGION_INTERVAL_US, last_update_region_time_us_) &&
OB_FAIL(update_self_region_())) {
// overwrite ret
PALF_LOG(WARN, "update_region failed", K(ret), KPC(this));
}
}

2
src/logservice/replayservice/ob_log_replay_service.cpp
View File

@ -752,6 +752,7 @@ share::SCN ObLogReplayService::inner_get_replayable_point_() const
rootserver::ObTenantInfoLoader *tenant_info_loader = MTL(rootserver::ObTenantInfoLoader*);
share::SCN recovery_until_scn;
if (OB_ISNULL(tenant_info_loader)) {
ret = OB_ERR_UNEXPECTED;
CLOG_LOG(WARN, "ObTenantInfoLoader is NULL", K(ret));
} else if (OB_FAIL(tenant_info_loader->get_recovery_until_scn(recovery_until_scn))) {
if (REACH_TIME_INTERVAL(5 * 1000 * 1000)) {
@ -1314,6 +1315,7 @@ int ObLogReplayService::handle_replay_task_(ObReplayServiceReplayTask *task_queu
ret = OB_ERR_UNEXPECTED;
CLOG_LOG(ERROR, "do statistics replay cost failed", KPC(replay_task), K(ret));
} else if (OB_ISNULL(link_to_destroy = task_queue->pop())) {
ret = OB_ERR_UNEXPECTED;
CLOG_LOG(ERROR, "failed to pop task after replay", KPC(replay_task), K(ret));
//It's impossible to get to this branch. Use on_replay_error to defend it.
on_replay_error_(*replay_task, ret);

5
src/logservice/restoreservice/ob_log_restore_net_driver.cpp
View File

@ -349,7 +349,8 @@ int ObLogRestoreNetDriver::add_ls_if_needed_with_lock_(const share::ObLSID &id,
share::SCN end_scn;
palf::PalfHandleGuard palf_handle_guard;
if (OB_ISNULL(fetcher_)) {
LOG_ERROR("fetcher is NULL", K(fetcher_));
ret = OB_ERR_UNEXPECTED;
LOG_ERROR("fetcher is NULL", K(ret), K(fetcher_));
} else if (fetcher_->is_ls_exist(id)) {
//TODO check ls in fetcher with proposal_id
} else if (OB_FAIL(log_service_->open_palf(id, palf_handle_guard))) {
@ -651,7 +652,7 @@ void ObLogRestoreNetDriver::LogErrHandler::handle_error(const share::ObLSID &ls_
if (palf::LSN(palf::LOG_INVALID_LSN_VAL) == lsn ) {
palf::LSN tmp_lsn = palf::LSN(palf::PALF_INITIAL_LSN_VAL);
palf::PalfHandleGuard palf_handle_guard;
if (OB_FAIL(OB_FAIL(MTL(ObLogService*)->open_palf(ls_id, palf_handle_guard)))) {
if (OB_FAIL(MTL(ObLogService*)->open_palf(ls_id, palf_handle_guard))) {
LOG_WARN("open palf failed", K(ls_id));
} else if (OB_FAIL(palf_handle_guard.get_end_lsn(tmp_lsn))) {
LOG_WARN("get end lsn failed", K(ls_id));

1
src/observer/mysql/ob_query_retry_ctrl.cpp
View File

@ -1192,6 +1192,7 @@ void ObQueryRetryCtrl::test_and_save_retry_state(const ObGlobalContext &gctx,
retry_func func = nullptr;
ObSQLSessionInfo *session = result.get_exec_context().get_my_session();
if (OB_ISNULL(session)) {
// ignore ret
// this is possible. #issue/43953721
LOG_WARN("session is null in exec_context. maybe OOM. don't retry", K(err));
} else if (OB_FAIL(get_func(err, is_inner_sql, func))) {

2
src/observer/mysql/ob_sync_cmd_driver.cpp
View File

@ -67,6 +67,7 @@ int ObSyncCmdDriver::seal_eof_packet(bool has_more_result, OMPKEOF& eofp)
const ObWarningBuffer *warnings_buf = common::ob_get_tsi_warning_buffer();
uint16_t warning_count = 0;
if (OB_ISNULL(warnings_buf)) {
// ignore ret
LOG_WARN("can not get thread warnings buffer", K(warnings_buf));
} else {
warning_count = static_cast<uint16_t>(warnings_buf->get_readable_warning_count());
@ -198,6 +199,7 @@ int ObSyncCmdDriver::response_result(ObMySQLResultSet &result)
ok_param.lii_ = result.get_last_insert_id_to_client();
const ObWarningBuffer *warnings_buf = common::ob_get_tsi_warning_buffer();
if (OB_ISNULL(warnings_buf)) {
// ignore ret
LOG_WARN("can not get thread warnings buffer");
} else {
ok_param.warnings_count_ =

2
src/observer/mysql/ob_sync_plan_driver.cpp
View File

@ -135,6 +135,7 @@ int ObSyncPlanDriver::response_result(ObMySQLResultSet &result)
const ObWarningBuffer *warnings_buf = common::ob_get_tsi_warning_buffer();
uint16_t warning_count = 0;
if (OB_ISNULL(warnings_buf)) {
// ignore ret
LOG_WARN("can not get thread warnings buffer");
} else {
warning_count = static_cast<uint16_t>(warnings_buf->get_readable_warning_count());
@ -212,6 +213,7 @@ int ObSyncPlanDriver::response_result(ObMySQLResultSet &result)
ok_param.lii_ = result.get_last_insert_id_to_client();
const ObWarningBuffer *warnings_buf = common::ob_get_tsi_warning_buffer();
if (OB_ISNULL(warnings_buf)) {
// ignore ret
LOG_WARN("can not get thread warnings buffer");
} else {
ok_param.warnings_count_ =

1
src/observer/mysql/obmp_change_user.cpp
View File

@ -293,6 +293,7 @@ int ObMPChangeUser::process()
if (OB_UNLIKELY(need_disconnect) && is_conn_valid()) {
if (OB_ISNULL(session)) {
// ignore ret
LOG_WARN("will disconnect connection", K(ret), K(session));
} else {
LOG_WARN("will disconnect connection", K(ret), KPC(session));

1
src/observer/mysql/obmp_packet_sender.cpp
View File

@ -874,6 +874,7 @@ int ObMPPacketSender::send_eof_packet(const ObSQLSessionInfo &session,
uint16_t warning_count = 0;
bool ac = true;
if (OB_ISNULL(warnings_buf)) {
// ignore ret
LOG_WARN("can not get thread warnings buffer");
} else {
warning_count = static_cast<uint16_t>(warnings_buf->get_readable_warning_count());

1
src/observer/mysql/obmp_query.cpp
View File

@ -811,6 +811,7 @@ OB_INLINE int ObMPQuery::do_process(ObSQLSessionInfo &session,
async_resp_used))) {
ObPhysicalPlanCtx *plan_ctx = result.get_exec_context().get_physical_plan_ctx();
if (OB_ISNULL(plan_ctx)) {
// ignore ret
LOG_ERROR("execute query fail, and plan_ctx is NULL", K(ret));
} else {
if (OB_TRANSACTION_SET_VIOLATION != ret && OB_REPLICA_NOT_READABLE != ret) {

1
src/observer/mysql/obmp_stmt_close.cpp
View File

@ -93,6 +93,7 @@ int ObMPStmtClose::process()
}
}
if (OB_FAIL(session->close_ps_stmt(stmt_id_))) {
// overwrite ret, 优先级低，被覆盖
LOG_WARN("fail to close ps stmt", K(ret), K_(stmt_id), K(session->get_sessid()));
}
if (OB_SUCCESS != tmp_ret) {

8
src/observer/mysql/obmp_stmt_execute.cpp
View File

@ -355,6 +355,7 @@ int ObMPStmtExecute::send_eof_packet_for_arraybinding(ObSQLSessionInfo &session_
const ObWarningBuffer *warnings_buf = common::ob_get_tsi_warning_buffer();
uint16_t warning_count = 0;
if (OB_ISNULL(warnings_buf)) {
// ignore ret
LOG_WARN("can not get thread warnings buffer");
} else {
warning_count = static_cast<uint16_t>(warnings_buf->get_readable_warning_count());
@ -1013,7 +1014,8 @@ int ObMPStmtExecute::decode_type_info(const char*& buf, TypeInfo &type_info)
PS_DEFENSE_CHECK(1)
{
uint64_t length = 0;
if (OB_FAIL(ObMySQLUtil::get_length(buf, length))) {
if (OB_FAIL(ret)) {
} else if (OB_FAIL(ObMySQLUtil::get_length(buf, length))) {
LOG_WARN("failed to get length", K(ret));
} else {
PS_DEFENSE_CHECK(length)
@ -1026,7 +1028,8 @@ int ObMPStmtExecute::decode_type_info(const char*& buf, TypeInfo &type_info)
PS_DEFENSE_CHECK(1)
{
uint64_t version = 0;
if (OB_FAIL(ObMySQLUtil::get_length(buf, version))) {
if (OB_FAIL(ret)) {
} else if (OB_FAIL(ObMySQLUtil::get_length(buf, version))) {
LOG_WARN("failed to get version", K(ret));
}
}
@ -1193,6 +1196,7 @@ int ObMPStmtExecute::execute_response(ObSQLSessionInfo &session,
async_resp_used))) {
ObPhysicalPlanCtx *plan_ctx = result.get_exec_context().get_physical_plan_ctx();
if (OB_ISNULL(plan_ctx)) {
// ignore ret
LOG_ERROR("execute query fail, and plan_ctx is NULL", K(ret));
} else {
LOG_WARN("execute query fail", K(ret), "timeout_timestamp",

1
src/observer/mysql/obmp_stmt_fetch.cpp
View File

@ -527,6 +527,7 @@ int ObMPStmtFetch::response_result(pl::ObPLCursorInfo &cursor,
const ObWarningBuffer *warnings_buf = common::ob_get_tsi_warning_buffer();
uint16_t warning_count = 0;
if (OB_ISNULL(warnings_buf)) {
// ignore ret
LOG_WARN("can not get thread warnings buffer");
} else {
warning_count = static_cast<uint16_t>(warnings_buf->get_readable_warning_count());

1
src/observer/mysql/obmp_stmt_prepare.cpp
View File

@ -474,6 +474,7 @@ int ObMPStmtPrepare::do_process(ObSQLSessionInfo &session,
async_resp_used))) {
ObPhysicalPlanCtx *plan_ctx = result.get_exec_context().get_physical_plan_ctx();
if (OB_ISNULL(plan_ctx)) {
// ignore ret
LOG_ERROR("execute query fail, and plan_ctx is NULL", K(ret));
} else {
LOG_WARN("execute query fail", K(ret), "timeout_timestamp",

2
src/observer/mysql/obmp_stmt_prexecute.cpp
View File

@ -556,6 +556,7 @@ int ObMPStmtPrexecute::execute_response(ObSQLSessionInfo &session,
const ObWarningBuffer *warnings_buf = common::ob_get_tsi_warning_buffer();
uint16_t warning_count = 0;
if (OB_ISNULL(warnings_buf)) {
// ignore ret
LOG_WARN("can not get thread warnings buffer");
} else {
warning_count = static_cast<uint16_t>(warnings_buf->get_readable_warning_count());
@ -686,6 +687,7 @@ int ObMPStmtPrexecute::execute_response(ObSQLSessionInfo &session,
} else if (OB_FAIL(response_result(result, session, force_sync_resp, async_resp_used))) {
ObPhysicalPlanCtx *plan_ctx = result.get_exec_context().get_physical_plan_ctx();
if (OB_ISNULL(plan_ctx)) {
// ignore ret
LOG_ERROR("execute query fail, and plan_ctx is NULL", K(ret));
} else {
LOG_WARN("execute query fail",

1
src/observer/mysql/obsm_utils.cpp
View File

@ -332,6 +332,7 @@ int ObSMUtils::cell_str(
OB_LOG(WARN, "failed to get udt info", K(ret), K(field));
}
if (OB_ISNULL(udt_info)) {
// overwrite ret
// try system udt
if (0 == field->type_owner_.case_compare(OB_SYS_DATABASE_NAME)
|| 0 == field->type_owner_.case_compare("SYS")) {

3
src/observer/ob_lease_state_mgr.cpp
View File

@ -135,8 +135,8 @@ int ObLeaseStateMgr::register_self()
}
LOG_INFO("start_heartbeat anyway");
// ignore ret overwrite
if (OB_FAIL(start_heartbeat())) {
// overwrite ret
LOG_ERROR("start_heartbeat failed", K(ret));
}
}
@ -288,6 +288,7 @@ int ObLeaseStateMgr::renew_lease()
}
const bool repeat = false;
if (OB_FAIL(hb_timer_.schedule(hb_, DELAY_TIME, repeat))) {
// overwrite ret
LOG_WARN("schedule failed", LITERAL_K(DELAY_TIME), K(repeat), K(ret));
}
}

2
src/observer/ob_service.cpp
View File

@ -156,8 +156,8 @@ void ObSchemaReleaseTimeTask::runTimerTask()
} else if (OB_FAIL(schema_updater_->try_release_schema())) {
LOG_WARN("ObSchemaReleaseTimeTask failed", K(ret));
}
// we should ignore error to schedule task
if (OB_FAIL(schedule_())) {
// overwrite ret
LOG_WARN("fail to schedule ObSchemaReleaseTimeTask in runTimerTask", KR(ret));
}
}

4
src/observer/report/ob_server_meta_table_checker.cpp
View File

@ -43,8 +43,8 @@ void ObServerLSMetaTableCheckTask::runTimerTask()
ObServerMetaTableChecker::ObMetaTableCheckType::CHECK_LS_META_TABLE))) {
LOG_WARN("fail to check ls meta table", KR(ret));
}
// ignore ret
if (OB_FAIL(checker_.schedule_ls_meta_check_task())) {
// overwrite ret
LOG_WARN("fail to schedule ls meta check task", KR(ret));
}
}
@ -62,8 +62,8 @@ void ObServerTabletMetaTableCheckTask::runTimerTask()
ObServerMetaTableChecker::ObMetaTableCheckType::CHECK_TABLET_META_TABLE))) {
LOG_WARN("fail to check tablet meta table", KR(ret));
}
// ignore ret
if (OB_FAIL(checker_.schedule_tablet_meta_check_task())) {
// overwrite ret
LOG_WARN("fail to schedule tablet meta check task", KR(ret));
}
}

1
src/observer/report/ob_tablet_table_updater.cpp
View File

@ -708,6 +708,7 @@ int ObTabletTableUpdater::batch_process_tasks(
const int64_t end = ObTimeUtility::current_time();
auto* statistics = GET_TSI(TSITabletTableUpdatStatistics);
if (OB_ISNULL(statistics)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("fail to get statistic", "ret", OB_ERR_UNEXPECTED);
} else {
(void)statistics->calc(succ_cnt, batch_tasks.count() - succ_cnt,

4
src/observer/report/ob_tenant_meta_checker.cpp
View File

@ -43,8 +43,8 @@ void ObTenantLSMetaTableCheckTask::runTimerTask()
if (OB_FAIL(checker_.check_ls_table())) {
LOG_WARN("fail to check ls meta table", KR(ret));
}
// ignore ret
if (OB_FAIL(checker_.schedule_ls_meta_check_task())) {
// overwrite ret
LOG_WARN("fail to schedule ls meta check task", KR(ret));
}
}
@ -61,8 +61,8 @@ void ObTenantTabletMetaTableCheckTask::runTimerTask()
if (OB_FAIL(checker_.check_tablet_table())) {
LOG_WARN("fail to check tablet meta table", KR(ret));
}
// ignore ret
if (OB_FAIL(checker_.schedule_tablet_meta_check_task())) {
// overwrite ret
LOG_WARN("fail to schedule tablet meta check task", KR(ret));
}
}

13
src/observer/table_load/ob_table_load_coordinator.cpp
View File

@ -101,19 +101,20 @@ void ObTableLoadCoordinator::abort_ctx(ObTableLoadTableCtx *ctx)
LOG_WARN("unexpected invalid coordinator ctx", KR(ret), KP(ctx->coordinator_ctx_));
} else {
LOG_INFO("coordinator abort");
int tmp_ret = OB_SUCCESS;
// 1. mark status abort, speed up background task exit
if (OB_FAIL(ctx->coordinator_ctx_->set_status_abort())) {
LOG_WARN("fail to set coordinator status abort", KR(ret));
if (OB_SUCCESS != (tmp_ret = ctx->coordinator_ctx_->set_status_abort())) {
LOG_WARN("fail to set coordinator status abort", KR(tmp_ret));
}
// 2. disable heart beat
ctx->coordinator_ctx_->set_enable_heart_beat(false);
// 3. mark all active trans abort
if (OB_FAIL(abort_active_trans(ctx))) {
LOG_WARN("fail to abort active trans", KR(ret));
if (OB_SUCCESS != (tmp_ret = abort_active_trans(ctx))) {
LOG_WARN("fail to abort active trans", KR(tmp_ret));
}
// 4. abort peers ctx
if (OB_FAIL(abort_peers_ctx(ctx))) {
LOG_WARN("fail to abort peers ctx", KR(ret));
if (OB_SUCCESS != (tmp_ret = abort_peers_ctx(ctx))) {
LOG_WARN("fail to abort peers ctx", KR(tmp_ret));
}
}
}

9
src/observer/table_load/ob_table_load_store.cpp
View File

@ -69,14 +69,15 @@ void ObTableLoadStore::abort_ctx(ObTableLoadTableCtx *ctx, bool &is_stopped)
} else {
LOG_INFO("store abort");
// 1. mark status abort, speed up background task exit
if (OB_FAIL(ctx->store_ctx_->set_status_abort())) {
LOG_WARN("fail to set store status abort", KR(ret));
int tmp_ret = OB_SUCCESS;
if (OB_SUCCESS != (tmp_ret = ctx->store_ctx_->set_status_abort())) {
LOG_WARN("fail to set store status abort", KR(tmp_ret));
}
// 2. disable heart beat check
ctx->store_ctx_->set_enable_heart_beat_check(false);
// 3. mark all active trans abort
if (OB_FAIL(abort_active_trans(ctx))) {
LOG_WARN("fail to abort active trans", KR(ret));
if (OB_SUCCESS != (tmp_ret = abort_active_trans(ctx))) {
LOG_WARN("fail to abort active trans", KR(tmp_ret));
}
ctx->store_ctx_->insert_table_ctx_->cancel();
ctx->store_ctx_->merger_->stop();

10
src/observer/table_load/resource/ob_table_load_resource_manager.cpp
View File

@ -280,10 +280,12 @@ int ObTableLoadResourceManager::release_resource(ObDirectLoadResourceReleaseArg
}
}
}
if (OB_FAIL(assigned_tasks_.erase_refactored(arg.task_key_))) {
LOG_WARN("fail to erase refactored", K(arg.task_key_));
} else {
LOG_INFO("ObTableLoadResourceManager::release_resource", K(arg));
if (OB_SUCC(ret)) {
if (OB_FAIL(assigned_tasks_.erase_refactored(arg.task_key_))) {
LOG_WARN("fail to erase refactored", K(arg.task_key_));
} else {
LOG_INFO("ObTableLoadResourceManager::release_resource", K(arg));
}
}
}
}

1
src/observer/virtual_table/ob_all_virtual_lock_wait_stat.cpp
View File

@ -247,6 +247,7 @@ int ObAllVirtualLockWaitStat::get_rowkey_holder(int64_t hash, transaction::ObTra
int ret = OB_SUCCESS;
ObLockWaitMgr *lwm = NULL;
if (OB_ISNULL(lwm = MTL(ObLockWaitMgr*))) {
ret = OB_ERR_UNEXPECTED;
SERVER_LOG(ERROR, "MTL(LockWaitMgr) is null");
} else if (OB_FAIL(lwm->get_hash_holder(hash, holder))){
SERVER_LOG(WARN, "get rowkey holder from lock wait mgr failed", K(ret), K(hash));

5
src/observer/virtual_table/ob_all_virtual_ls_log_restore_status.cpp
View File

@ -68,10 +68,12 @@ int ObVirtualLSLogRestoreStatus::inner_get_next_row(common::ObNewRow *&row)
ObLSService *ls_svr = MTL(ObLSService*);
if (is_user_tenant(MTL_ID())) {
if (OB_ISNULL(ls_svr)) {
ret = OB_ERR_UNEXPECTED;
SERVER_LOG(WARN, "mtl ObLSService should not be null", K(ret));
} else if (OB_FAIL(ls_svr->get_ls_iter(guard, ObLSGetMod::LOG_MOD))) {
SERVER_LOG(WARN, "get ls iter failed", K(ret));
} else if (OB_ISNULL(iter = guard.get_ptr())) {
ret = OB_ERR_UNEXPECTED;
SERVER_LOG(WARN, "ls iter is NULL", K(ret), K(iter));
} else {
while (OB_SUCC(ret)) {
@ -84,6 +86,7 @@ int ObVirtualLSLogRestoreStatus::inner_get_next_row(common::ObNewRow *&row)
SERVER_LOG(WARN, "iter to end", K(ret));
}
} else if (OB_ISNULL(ls)) {
ret = OB_ERR_UNEXPECTED;
SERVER_LOG(WARN, "ls is NULL", K(ret), K(ls));
} else {
SERVER_LOG(TRACE, "start to iterate this log_stream", K(MTL_ID()), K(ls->get_ls_id()));
@ -91,6 +94,7 @@ int ObVirtualLSLogRestoreStatus::inner_get_next_row(common::ObNewRow *&row)
logservice::RestoreStatusInfo sys_restore_status_info;
restore_handler = ls->get_log_restore_handler();
if (OB_ISNULL(restore_handler)) {
ret = OB_ERR_UNEXPECTED;
SERVER_LOG(WARN, "restore handler is NULL", K(ret), K(ls));
} else if (OB_FAIL(restore_handler->get_ls_restore_status_info(restore_status_info))) {
SERVER_LOG(WARN, "fail to get ls restore status info");
@ -106,6 +110,7 @@ int ObVirtualLSLogRestoreStatus::inner_get_next_row(common::ObNewRow *&row)
} else { // sys ls
rootserver::ObRecoveryLSService *ls_recovery_svr = MTL(rootserver::ObRecoveryLSService*);
if (OB_ISNULL(ls_recovery_svr)) {
ret = OB_ERR_UNEXPECTED;
SERVER_LOG(WARN, "ls recovery service is NULL", K(ret), K(ls));
} else if (OB_FAIL(ls_recovery_svr->get_sys_restore_status(sys_restore_status_info))) {
SERVER_LOG(WARN, "get sys restore status failed", K(ls));

1
src/observer/virtual_table/ob_all_virtual_mds_node_stat.cpp
View File

@ -302,6 +302,7 @@ int ObAllVirtualMdsNodeStat::get_tablet_info_(ObLS &ls, const ObFunction<int(ObT
if (OB_FAIL(ls.get_tablet(tablet_points_[idx], tablet_handle, 0, storage::ObMDSGetTabletMode::READ_WITHOUT_CHECK))) {
MDS_LOG(WARN, "fail to get tablet", KR(ret), K(key_ranges_), K(*this));
} else if (OB_ISNULL(tablet_handle.get_obj())) {
ret = OB_ERR_UNEXPECTED;
MDS_LOG(ERROR, "get null tablet ptr", KR(ret), K(key_ranges_), K(*this));
} else if (OB_FAIL(apply_on_tablet_op(*tablet_handle.get_obj()))) {
MDS_LOG(WARN, "fail to apply op on tablet", KR(ret), K(key_ranges_), K(*this));

1
src/observer/virtual_table/ob_information_columns_table.cpp
View File

@ -1277,6 +1277,7 @@ inline int ObInfoSchemaColumnsTable::init_mem_context()
if (OB_FAIL(CURRENT_CONTEXT->CREATE_CONTEXT(mem_context_, param))) {
SQL_ENG_LOG(WARN, "create entity failed", K(ret));
} else if (OB_ISNULL(mem_context_)) {
ret = OB_ERR_UNEXPECTED;
SQL_ENG_LOG(WARN, "mem entity is null", K(ret));
}
}

1
src/observer/virtual_table/ob_information_user_privileges_table.cpp
View File

@ -166,6 +166,7 @@ int ObInfoSchemaUserPrivilegesTable::get_user_infos(const uint64_t tenant_id,
} else {
const share::schema::ObUserInfo *user_info = NULL;
if (OB_ISNULL(user_info = schema_guard_->get_user_info(tenant_id_, user_id))) {
// ignore ret
SERVER_LOG(WARN, "Get user infos with tenant user id error", K(ret), K_(tenant_id));
} else if (OB_FAIL(user_infos.push_back(user_info))) {
SERVER_LOG(WARN, "Failed to add user info", K(ret));

1
src/observer/virtual_table/ob_tenant_virtual_get_object_definition.cpp
View File

@ -697,6 +697,7 @@ int ObGetObjectDefinition::get_database_id(uint64_t tenant_id,
} else if (OB_FAIL(schema_guard_->get_database_schema(tenant_id, db_name, database_schema))) {
LOG_WARN("get database schema failed", K(ret));
} else if (OB_ISNULL(database_schema)) {
ret = OB_ERR_OBJECT_NOT_FOUND;
LOG_WARN("database not found", K(db_name));
} else if (FALSE_IT(database_id = database_schema->get_database_id())) {
}

1
src/observer/virtual_table/ob_virtual_open_cursor_table.cpp
View File

@ -153,6 +153,7 @@ bool ObVirtualOpenCursorTable::FillScanner::operator()(sql::ObSQLSessionMgr::Key
pl::ObPLCursorInfo *cursor_info = iter->second;
if (OB_ISNULL(cursor_info)) {
// do not report error
// ignore ret
SERVER_LOG(WARN, "get a NULL cursor when record for v$open_cursor.");
} else {
OZ (fill_session_cursor_cell(*sess_info, cursor_info->get_id()));

6
src/observer/virtual_table/ob_virtual_show_trace.cpp
View File

@ -557,7 +557,8 @@ int ObVirtualShowTrace::find_child_span_info(sql::ObFLTShowTraceRec::trace_forma
*/
}
if (OB_FAIL(tmp_arr.push_back(show_trace_arr_.at(i)))) {
if(OB_FAIL(ret)){
} else if (OB_FAIL(tmp_arr.push_back(show_trace_arr_.at(i)))) {
LOG_WARN("failed to push back show trace value", K(ret), K(i));
}
} else {
@ -626,7 +627,8 @@ int ObVirtualShowTrace::find_child_span_info(sql::ObFLTShowTraceRec::trace_forma
= sql::ObFLTShowTraceRec::trace_formatter::LineType::LT_NODE;
}
}
if (OB_ISNULL(tmp_arr.at(tmp_arr.count()-1))) {
if (OB_FAIL(ret)) {
} else if (OB_ISNULL(tmp_arr.at(tmp_arr.count()-1))) {
ret = OB_ERR_UNEXPECTED;
SERVER_LOG(WARN, "record ptr is null");
} else {

1
src/pl/ob_pl_di_adt_service.cpp
View File

@ -860,6 +860,7 @@ int ObPLDIADTService::get_seg_pointer_array(jit::ObLLVMDIType &type)
32, member_types, seg_pointer_array_))) {
LOG_WARN("failed to create struct type", K(ret));
} else if (OB_ISNULL(seg_pointer_array_.get_v())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("failed to create di seg pointer array", K(ret));
}
}

1
src/pl/ob_pl_resolver.cpp
View File

@ -4202,6 +4202,7 @@ int ObPLResolver::resolve_case(const ObStmtNodeTree *parse_tree, ObPLCaseStmt *s
if (OB_FAIL(stmt_factory_.allocate(PL_SIGNAL, else_block, stmt))) {
LOG_WARN("failed to alloc stmt", K(ret));
} else if (OB_ISNULL(signal_stmt = static_cast<ObPLSignalStmt*>(stmt))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("failed to cast stmt", K(ret));
} else {
signal_stmt->set_cond_type(ERROR_CODE);

1
src/pl/sys_package/ob_dbms_limit_calculator_mysql.cpp
View File

@ -394,6 +394,7 @@ int ObDBMSLimitCalculator::get_server_resource_info_(
}
}
if (OB_TMP_FAIL(proxy.wait_all(return_code_array))) {
// overwrite ret
ret = OB_SUCC(ret) ? tmp_ret : ret;
LOG_WARN("wait all batch result failed", KR(ret), KR(tmp_ret));
} else if (OB_FAIL(ret)) {

1
src/rootserver/ddl_task/ob_constraint_task.cpp
View File

@ -1910,6 +1910,7 @@ int ObConstraintTask::set_constraint_validated()
}
DEBUG_SYNC(CONSTRAINT_SET_VALID);
if (OB_FAIL(switch_status(ObDDLTaskStatus::SUCCESS, true, ret))) {
// overwrite ret
LOG_WARN("switch status failed", K(ret));
}
return ret;

2
src/rootserver/ddl_task/ob_ddl_redefinition_task.cpp
View File

@ -291,8 +291,8 @@ int ObDDLRedefinitionTask::prepare(const ObDDLTaskStatus next_task_status)
ret = OB_NOT_INIT;
LOG_WARN("ObDDLRedefinitionTask has not been inited", K(ret));
}
// overwrite ret
if (OB_FAIL(switch_status(next_task_status, true, ret))) {
// overwrite ret
LOG_WARN("fail to switch status", K(ret));
}
return ret;

1
src/rootserver/ddl_task/ob_table_redefinition_task.cpp
View File

@ -443,6 +443,7 @@ int ObTableRedefinitionTask::table_redefinition(const ObDDLTaskStatus next_task_
}
}
if (OB_FAIL(switch_status(next_task_status, true, ret))) {
// overwrite ret
LOG_WARN("fail to switch task status", K(ret));
}
}

4
src/rootserver/ob_ddl_operator.cpp
View File

@ -4612,6 +4612,7 @@ int ObDDLOperator::drop_obj_privs(
int64_t new_schema_version = OB_INVALID_VERSION;
if (OB_ISNULL(obj_priv)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("obj_priv priv is NULL", K(ret), K(obj_priv));
} else {
OZ (schema_service.gen_new_schema_version(tenant_id, new_schema_version));
@ -6856,6 +6857,7 @@ int ObDDLOperator::drop_db_table_privs(
const ObDBPriv *db_priv = db_privs.at(i);
int64_t new_schema_version = OB_INVALID_VERSION;
if (OB_ISNULL(db_priv)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("db priv is NULL", K(ret), K(db_priv));
} else if (OB_FAIL(schema_service_.gen_new_schema_version(tenant_id, new_schema_version))) {
LOG_WARN("fail to gen new schema_version", K(ret), K(tenant_id));
@ -6879,6 +6881,7 @@ int ObDDLOperator::drop_db_table_privs(
const ObTablePriv *table_priv = table_privs.at(i);
int64_t new_schema_version = OB_INVALID_VERSION;
if (OB_ISNULL(table_priv)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("table priv is NULL", K(ret), K(table_priv));
} else if (OB_FAIL(schema_service_.gen_new_schema_version(tenant_id, new_schema_version))) {
LOG_WARN("fail to gen new schema_version", K(ret), K(tenant_id));
@ -6929,6 +6932,7 @@ int ObDDLOperator::drop_db_table_privs(
const ObObjPriv *obj_priv = obj_privs.at(i);
int64_t new_schema_version = OB_INVALID_VERSION;
if (OB_ISNULL(obj_priv)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("obj_priv priv is NULL", K(ret), K(obj_priv));
} else if (OB_FAIL(schema_service_.gen_new_schema_version(tenant_id, new_schema_version))) {
LOG_WARN("fail to gen new schema_version", K(ret), K(tenant_id));

3
src/rootserver/ob_ddl_service.cpp
View File

@ -19190,10 +19190,12 @@ int ObDDLService::swap_orig_and_hidden_table_state(obrpc::ObAlterTableArg &alter
based_table_schema))) {
LOG_WARN("fail to get table schema", KR(ret), K(based_info));
} else if (OB_ISNULL(based_table_schema)) {
// ignore ret
LOG_WARN("based table is not exist", KR(ret), K(based_info));
is_based_schema_version_consistent = false;
} else if (OB_UNLIKELY(based_table_schema->get_schema_version() !=
based_info.schema_version_)) {
// ignore ret
LOG_WARN("based table schema version is changed", KR(ret), K(based_info),
KPC(based_table_schema));
is_based_schema_version_consistent = false;
@ -29368,6 +29370,7 @@ int ObDDLService::check_tenant_has_been_dropped_(
} else if (OB_FAIL(guard.get_tenant_info(tenant_id, tenant))) {
LOG_WARN("fail to get tenant info", KR(ret), K(tenant_id));
} else if (OB_ISNULL(tenant)) {
// ignore ret
LOG_WARN("tenant not exist, maybe schema is fall behind", KR(ret), K(tenant_id));
} else if (tenant->is_dropping()) {
ObLSStatusOperator ls_status;

2
src/rootserver/ob_index_builder.cpp
View File

@ -676,7 +676,7 @@ int ObIndexBuilder::do_create_local_index(
my_arg.index_schema_.set_index_type(INDEX_TYPE_SPATIAL_GLOBAL_LOCAL_STORAGE);
}
}
if (OB_FAIL(ObIndexBuilderUtil::adjust_expr_index_args(
if (FAILEDx(ObIndexBuilderUtil::adjust_expr_index_args(
my_arg, new_table_schema, allocator, gen_columns))) {
LOG_WARN("fail to adjust expr index args", K(ret));
} else if (OB_FAIL(generate_schema(

1
src/rootserver/ob_root_inspection.cpp
View File

@ -508,6 +508,7 @@ int ObPurgeRecyclebinTask::process()
// the error code is only for outputtion log, the function will return success.
// the task no need retry, because it will be triggered periodically.
if (OB_FAIL(root_service_.schedule_recyclebin_task(delay))) {
// overwrite ret
LOG_WARN("schedule purge recyclebin task failed", KR(ret), K(delay));
} else {
LOG_INFO("submit purge recyclebin task success", K(delay));

4
src/rootserver/ob_server_balancer.cpp
View File

@ -3157,9 +3157,9 @@ int ObServerBalancer::CountBalanceStrategy::try_exchange_ug_balance_inter_ttg_lo
LOG_WARN("fail to get excluded servers", K(ret));
} else if (has_exist_in_array(excluded_servers, left_inter_load.server_)) {
// ignore this
} else if (left_ug->get_inter_ttg_load_value(right_inter_load, left_ug_load_value)) {
} else if (OB_FAIL(left_ug->get_inter_ttg_load_value(right_inter_load, left_ug_load_value))) {
LOG_WARN("fail to get inter ttg load value", K(ret));
} else if (right_ug->get_inter_ttg_load_value(right_inter_load, right_ug_load_value)) {
} else if (OB_FAIL(right_ug->get_inter_ttg_load_value(right_inter_load, right_ug_load_value))) {
LOG_WARN("fail to get inter ttg load value", K(ret));
} else if (left_ug_load_value - right_ug_load_value <= EPSILON) {
// ignore this, since this almost has no effect for load balance

1
src/rootserver/ob_tenant_role_transition_service.cpp
View File

@ -802,6 +802,7 @@ int do_nonblock_renew(const ARRAY_L &array_l, const ARRAY_R &array_r, const uint
bool found = false;
FOREACH_CNT_X(r, array_r, !found) {
if (OB_ISNULL(r)) {
// ignore ret
LOG_WARN("r is null", KR(ret), K(array_r));
} else if (*r == ls_id) {
found = true;

2
src/rootserver/ob_unit_manager.cpp
View File

@ -1468,7 +1468,7 @@ int ObUnitManager::do_split_pool_persistent_info(
}
}
if (OB_FAIL(ret)) {
} else if (ut_operator_.remove_resource_pool(trans, pool->resource_pool_id_)) {
} else if (OB_FAIL(ut_operator_.remove_resource_pool(trans, pool->resource_pool_id_))) {
LOG_WARN("fail to remove resource pool persistent info", K(ret),
"pool_id", pool->resource_pool_id_);
} else {} // all persistent infos update finished

2
src/share/backup/ob_log_restore_struct.cpp
View File

@ -296,7 +296,7 @@ int ObRestoreSourceServiceAttr::parse_ip_port_from_str(const char *ip_list, cons
char tmp_str[OB_MAX_RESTORE_SOURCE_IP_LIST_LEN + 1] = { 0 };
char *token = nullptr;
char *saveptr = nullptr;
if (OB_FAIL(databuff_printf(tmp_str, sizeof(tmp_str), "%s", ip_list))) {
if (FAILEDx(databuff_printf(tmp_str, sizeof(tmp_str), "%s", ip_list))) {
LOG_WARN("fail to get ip list", K(ip_list));
} else {
token = tmp_str;

12
src/share/config/ob_config_manager.cpp
View File

@ -231,19 +231,23 @@ int ObConfigManager::dump2file(const char* path) const
char *hist_path = nullptr;
int64_t pos = 0;
need_retry = false;
int tmp_ret = OB_SUCCESS;
int tmp_ret_2 = OB_SUCCESS;
if (OB_ISNULL(buf = pa.alloc(buf_size))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_ERROR("ob tc malloc memory for buf failed", K(ret));
}
if (OB_ISNULL(tmp_path = pa.alloc(MAX_PATH_SIZE))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_ERROR("ob tc malloc memory for tmp configure path failed", K(ret));
tmp_ret = OB_ALLOCATE_MEMORY_FAILED;
ret = OB_SUCC(ret) ? tmp_ret : ret;
LOG_ERROR("ob tc malloc memory for tmp configure path failed", K(ret), K(tmp_ret));
} else {
snprintf(tmp_path, MAX_PATH_SIZE, "%s.tmp", path);
}
if (OB_ISNULL(hist_path = pa.alloc(MAX_PATH_SIZE))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_ERROR("ob tc malloc memory for history configure path fail", K(ret));
tmp_ret_2 = OB_ALLOCATE_MEMORY_FAILED;
ret = OB_SUCC(ret) ? tmp_ret_2 : ret;
LOG_ERROR("ob tc malloc memory for history configure path fail", K(ret), K(tmp_ret_2));
} else {
snprintf(hist_path, MAX_PATH_SIZE, "%s.history", path);
}

4
src/share/deadlock/ob_deadlock_detector_mgr.cpp
View File

@ -185,7 +185,8 @@ int ObDeadLockDetectorMgr::init()
proxy_ = new (proxy_) obrpc::ObDetectorRpcProxy();
rpc_ = new (rpc_) ObDeadLockDetectorRpc();
}
if (OB_FAIL(time_wheel_.init(TIME_WHEEL_PRECISION_US,
if (OB_FAIL(ret)) {
} else if (OB_FAIL(time_wheel_.init(TIME_WHEEL_PRECISION_US,
TIMER_THREAD_COUNT,
DETECTOR_TIMER_NAME))) {
DETECT_LOG(WARN, "time_wheel_ init failed", PRINT_WRAPPER);
@ -394,6 +395,7 @@ int ObDeadLockDetectorMgr::process_notify_parent_message(
SET_USE_500(attr);
ObDeadLockDetectorMgr *p_deadlock_detector_mgr = MTL(ObDeadLockDetectorMgr *);
if (OB_ISNULL(p_deadlock_detector_mgr)) {
ret = OB_ERR_UNEXPECTED;
DETECT_LOG(ERROR, "can not get ObDeadLockDetectorMgr", KP(p_deadlock_detector_mgr), K(MTL_ID()));
} else if (OB_FAIL(p_deadlock_detector_mgr->inner_alloc_handle_.inner_factory_.create(binary_key,
[](const common::ObIArray<ObDetectorInnerReportInfo> &,

4
src/share/deadlock/ob_deadlock_detector_rpc.cpp
View File

@ -38,6 +38,7 @@ int ObDetectorLCLMessageP::process()
DETECT_TIME_GUARD(100_ms);
ObDeadLockDetectorMgr *p_deadlock_detector_mgr = MTL(ObDeadLockDetectorMgr *);
if (OB_ISNULL(p_deadlock_detector_mgr)) {
ret = OB_ERR_UNEXPECTED;
DETECT_LOG(ERROR, "can not get ObDeadLockDetectorMgr", KP(p_deadlock_detector_mgr));
} else if (OB_FAIL(p_deadlock_detector_mgr->process_lcl_message(arg_))) {
DETECT_LOG(WARN, "process lcl message failed", KR(ret), KP(p_deadlock_detector_mgr));
@ -54,6 +55,7 @@ int ObDeadLockCollectInfoMessageP::process()
DETECT_TIME_GUARD(100_ms);
ObDeadLockDetectorMgr *p_deadlock_detector_mgr = MTL(ObDeadLockDetectorMgr *);
if (OB_ISNULL(p_deadlock_detector_mgr)) {
ret = OB_ERR_UNEXPECTED;
DETECT_LOG(ERROR, "can not get ObDeadLockDetectorMgr", KP(p_deadlock_detector_mgr));
} else if (OB_FAIL(p_deadlock_detector_mgr->process_collect_info_message(arg_))) {
DETECT_LOG(WARN, "process collect info message failed",
@ -74,6 +76,7 @@ int ObDeadLockNotifyParentMessageP::process()
DETECT_LOG(INFO, "receive notify parent msg", K(arg_));
ObDeadLockDetectorMgr *p_deadlock_detector_mgr = MTL(ObDeadLockDetectorMgr *);
if (OB_ISNULL(p_deadlock_detector_mgr)) {
ret = OB_ERR_UNEXPECTED;
DETECT_LOG(ERROR, "can not get ObDeadLockDetectorMgr", KP(p_deadlock_detector_mgr));
} else if (OB_FAIL(p_deadlock_detector_mgr->process_notify_parent_message(arg_))) {
DETECT_LOG(WARN, "process notify parent message failed",
@ -196,6 +199,7 @@ int ObDeadLockDetectorRpc::post_notify_parent_message(const ObAddr &dest_addr,
} else if (dest_addr == self_) {
ObDeadLockDetectorMgr *p_deadlock_detector_mgr = MTL(ObDeadLockDetectorMgr *);
if (OB_ISNULL(p_deadlock_detector_mgr)) {
ret = OB_ERR_UNEXPECTED;
DETECT_LOG(ERROR, "can not get ObDeadLockDetectorMgr", KP(p_deadlock_detector_mgr));
} else if(OB_FAIL(p_deadlock_detector_mgr->process_notify_parent_message(msg))) {
DETECT_LOG(WARN, "process notify parent message failed", KR(ret), KP(p_deadlock_detector_mgr));

9
src/share/deadlock/ob_lcl_scheme/ob_lcl_node.cpp
View File

@ -900,6 +900,7 @@ ObLCLNode::PushStateTask::PushStateTask(ObLCLNode &node) : expected_executed_ts(
void ObLCLNode::PushStateTask::runTimerTask()
{
int ret = OB_SUCCESS;
int tmp_ret = OB_SUCCESS;
const int64_t current_ts = ObClockGenerator::getRealClock();
DETECT_TIME_GUARD(100_ms);
@ -921,13 +922,13 @@ void ObLCLNode::PushStateTask::runTimerTask()
CLICK();
(void)lcl_node_.update_lcl_period_if_necessary_with_lock_();
if (CLICK() && OB_FAIL(lcl_node_.push_state_to_downstreams_with_lock_())) {
if (CLICK() && OB_TMP_FAIL(lcl_node_.push_state_to_downstreams_with_lock_())) {
DETECT_LOG(WARN, "push state to downstreams failed",
K(current_ts), K(expected_executed_ts), K(*this));
K(tmp_ret), K(current_ts), K(expected_executed_ts), K(*this));
}
if (CLICK() && OB_FAIL(lcl_node_.register_timer_with_necessary_retry_with_lock_())) {
DETECT_LOG(ERROR, "register timer task with retry failed", K(*this));
if (CLICK() && OB_TMP_FAIL(lcl_node_.register_timer_with_necessary_retry_with_lock_())) {
DETECT_LOG(ERROR, "register timer task with retry failed", K(tmp_ret), K(*this));
} else {}
} else {
// may destory itself here, make sure it is the last action of this function

2
src/share/detect/ob_detect_callback.cpp
View File

@ -263,6 +263,7 @@ int ObSingleDfoDetectCB::do_callback()
if (OB_SUCC(clean_ret)) {
dtl::ObDTLIntermResultManager *interm_res_manager = MTL(dtl::ObDTLIntermResultManager*);
if (OB_ISNULL(interm_res_manager)) {
// ignore ret
LIB_LOG(WARN, "[DM] single dfo erase_interm_result_info, but interm_res_manager is null",
K(ret), K(key_), K_(trace_id));
} else {
@ -279,6 +280,7 @@ int ObTempTableDetectCB::do_callback()
int ret = OB_SUCCESS;
dtl::ObDTLIntermResultManager *interm_res_manager = MTL(dtl::ObDTLIntermResultManager*);
if (OB_ISNULL(interm_res_manager)) {
// ignore ret
LIB_LOG(WARN, "[DM] temp table erase_interm_result_info, but interm_res_manager is null",
K(ret), K(key_), K_(trace_id));
} else {

3
src/share/detect/ob_detect_manager.cpp
View File

@ -686,6 +686,7 @@ int ObDetectManagerThread::detect() {
MTL_SWITCH(tenant_ids.at(i)) {
ObDetectManager* dm = MTL(ObDetectManager*);
if (OB_ISNULL(dm)) {
// ignore ret
LIB_LOG(WARN, "[DM] dm is null", K(tenant_ids.at(i)));
} else if (OB_FAIL(dm->gather_requests(req_map_, temp_mem_context))) {
LIB_LOG(WARN, "[DM] failed to gather_requests", K(tenant_ids.at(i)));
@ -741,6 +742,7 @@ void ObDetectManagerThread::detect_local(const obrpc::ObTaskStateDetectReq *req)
MTL_SWITCH(detectable_id.tenant_id_) {
ObDetectManager* dm = MTL(ObDetectManager*);
if (OB_ISNULL(dm)) {
// ignore ret
LIB_LOG(WARN, "[DM] dm is null", K(detectable_id.tenant_id_));
} else {
dm->do_detect_local(detectable_id);
@ -815,6 +817,7 @@ void ObDetectManagerThread::handle_one_result(const obrpc::ObDetectRpcStatus &rp
MTL_SWITCH(detectable_id.tenant_id_) {
ObDetectManager* dm = MTL(ObDetectManager*);
if (OB_ISNULL(dm)) {
// ignore ret
LIB_LOG(WARN, "[DM] dm is null", K(detectable_id.tenant_id_));
} else {
dm->do_handle_one_result(detectable_id, rpc_status);

7
src/share/detect/ob_detect_manager_utils.cpp
View File

@ -48,6 +48,7 @@ int ObDetectManagerUtils::qc_register_detectable_id_into_dm(ObDetectableId &dete
} else {
ObDetectManager* dm = MTL(ObDetectManager*);
if (OB_ISNULL(dm)) {
// ignore ret
LIB_LOG(WARN, "[DM] dm is null", K(tenant_id));
} else if (OB_FAIL(dm->register_detectable_id(detectable_id))) {
LIB_LOG(WARN, "[DM] QC fail to register detectable_id", K(ret), K(detectable_id), K(tenant_id));
@ -88,6 +89,7 @@ int ObDetectManagerUtils::qc_register_check_item_into_dm(ObDfo &dfo,
uint64_t node_sequence_id = 0;
ObDetectManager* dm = MTL(ObDetectManager*);
if (OB_ISNULL(dm)) {
// ignore ret
LIB_LOG(WARN, "[DM] dm is null", K(sqc_detectable_id));
} else if (OB_SUCC(dm->register_check_item(
sqc_detectable_id, cb, node_sequence_id, true,
@ -136,6 +138,7 @@ void ObDetectManagerUtils::qc_unregister_all_check_items_from_dm(const ObIArray<
int ret = OB_SUCCESS;
ObDetectManager* dm = MTL(ObDetectManager*);
if (OB_ISNULL(dm)) {
// ignore ret
LIB_LOG(WARN, "[DM] dm is null");
} else {
for (int64_t idx = 0; idx < dfos.count(); ++idx) {
@ -156,6 +159,7 @@ int ObDetectManagerUtils::sqc_register_into_dm(ObPxSqcHandler *sqc_handler, ObPx
// must be success or sql being interrupted unexpectedly
ObDetectManager* dm = MTL(ObDetectManager*);
if (OB_ISNULL(dm)) {
// ignore ret
LIB_LOG(WARN, "[DM] dm is null");
} else if (OB_FAIL(dm->register_detectable_id(sqc_detectable_id))) {
LIB_LOG(WARN, "[DM] sqc failed to register_detectable_id", K(ret), K(sqc_detectable_id), K(qc_detectable_id));
@ -231,6 +235,7 @@ int ObDetectManagerUtils::single_dfo_register_check_item_into_dm(const common::O
MTL_SWITCH(tenant_id) {
ObDetectManager* dm = MTL(ObDetectManager*);
if (OB_ISNULL(dm)) {
// ignore ret
LIB_LOG(WARN, "[DM] dm is null", K(tenant_id));
} else if (OB_FAIL(dm->register_check_item(
register_dm_info.detectable_id_, cb, node_sequence_id, false,
@ -262,6 +267,7 @@ int ObDetectManagerUtils::temp_table_register_check_item_into_dm(const common::O
if (OB_SUCC(ret)) {
ObDetectManager* dm = MTL(ObDetectManager*);
if (OB_ISNULL(dm)) {
// ignore ret
LIB_LOG(WARN, "[DM] dm is null", K(qc_detectable_id));
} else if (OB_FAIL(dm->register_check_item(
qc_detectable_id, cb, node_sequence_id, false,
@ -311,6 +317,7 @@ int ObDetectManagerUtils::p2p_datahub_register_check_item_into_dm(const common::
} else {
ObDetectManager* dm = MTL(ObDetectManager*);
if (OB_ISNULL(dm)) {
// ignore ret
LIB_LOG(WARN, "[DM] dm is null", K(qc_detectable_id));
} else if (OB_SUCC(dm->register_check_item(
qc_detectable_id, cb, node_sequence_id, false,

1
src/share/detect/ob_detect_rpc_processor.cpp
View File

@ -26,6 +26,7 @@ int ObDetectRpcP::process()
MTL_SWITCH(detectable_id.tenant_id_) {
ObDetectManager* dm = MTL(ObDetectManager*);
if (OB_ISNULL(dm)) {
// ignore ret
LIB_LOG(WARN, "[DM] dm is null", K(detectable_id.tenant_id_));
continue;
}

4
src/share/detect/ob_detect_rpc_proxy.cpp
View File

@ -49,8 +49,8 @@ int ObTaskStateDetectReq::deserialize(const char *buf, const int64_t data_len, i
if (NULL == buf || data_len <= 0) {
ret = OB_INVALID_ARGUMENT;
COMMON_LOG(WARN, "[DM] invalid arguments.", KP(buf), K(data_len), K(ret));
} else if (serialization::decode_vi64(
buf, data_len, pos, reinterpret_cast<int64_t *>(&peer_id_size))) {
} else if (OB_FAIL(serialization::decode_vi64(
buf, data_len, pos, reinterpret_cast<int64_t *>(&peer_id_size)))) {
COMMON_LOG(WARN, "[DM] deserialize peer_id_size failed.",
KP(buf), K(data_len), K(pos), K(peer_id_size), K(ret));
} else {

4
src/share/index_usage/ob_index_usage_info_mgr.cpp
View File

@ -173,11 +173,11 @@ int ObIndexUsageInfoMgr::start()
// report index usage
if (OB_FAIL(TG_SCHEDULE(MTL(omt::ObSharedTimer *)->get_tg_id(), report_task_, INDEX_USAGE_REPORT_INTERVAL, true))) {
LOG_WARN("failed to schedule index usage report task", K(ret));
} else if (report_task_.init(this)) {
} else if (OB_FAIL(report_task_.init(this))) {
LOG_WARN("fail to init report task", K(ret));
} else if (OB_FAIL(TG_SCHEDULE(MTL(omt::ObSharedTimer *)->get_tg_id(), refresh_conf_task_, INDEX_USAGE_REFRESH_CONF_INTERVAL, true))) {
LOG_WARN("failed to schedule index usage refresh conf task", K(ret));
} else if (refresh_conf_task_.init((this))) {
} else if (OB_FAIL(refresh_conf_task_.init((this)))) {
LOG_WARN("fail to init refresh conf task", K(ret));
} else {
LOG_TRACE("success to start ObIndexUsageInfoMgr", K(tenant_id_));

6
src/share/location_cache/ob_location_update_task.cpp
View File

@ -192,8 +192,8 @@ void ObLSLocationTimerTask::runTimerTask()
if (OB_FAIL(ls_loc_service_.renew_all_ls_locations())) {
LOG_WARN("fail to renew_all_ls_locations", KR(ret));
}
// ignore ret
if (OB_FAIL(ls_loc_service_.schedule_ls_timer_task())) {
// overwrite ret
LOG_WARN("fail to schedule ls location timer task", KR(ret));
}
}
@ -210,8 +210,8 @@ void ObLSLocationByRpcTimerTask::runTimerTask()
if (OB_FAIL(ls_loc_service_.renew_all_ls_locations_by_rpc())) {
LOG_WARN("fail to renew_all_ls_location by rpc", KR(ret));
}
// ignore ret
if (OB_FAIL(ls_loc_service_.schedule_ls_by_rpc_timer_task())) {
// overwrite ret
LOG_WARN("fail to schedule ls location by rpc timer task", KR(ret));
}
}
@ -228,8 +228,8 @@ void ObDumpLSLocationCacheTimerTask::runTimerTask()
if (OB_FAIL(ls_loc_service_.dump_cache())) {
LOG_WARN("fail to dump ls location cache", KR(ret));
}
// ignore ret
if (OB_FAIL(ls_loc_service_.schedule_dump_cache_timer_task())) {
// overwrite ret
LOG_WARN("fail to schedule dump ls location cache timer task", KR(ret));
}
}

1
src/share/ob_alive_server_tracer.cpp
View File

@ -257,6 +257,7 @@ void ObAliveServerRefreshTask::runTimerTask()
if (OB_FAIL(TG_SCHEDULE(lib::TGDefIDs::ServerTracerTimer, *this,
REFRESH_INTERVAL_US))) {
// overwrite ret
// schedule task fail is fatal ERROR
if (OB_CANCELED != ret) {
LOG_ERROR("schedule task failed", K(ret), "task", *this);

3
src/share/ob_ddl_task_executor.cpp
View File

@ -251,6 +251,7 @@ void ObDDLTaskExecutor::run1()
break;
}
} else if (OB_ISNULL(task)) {
ret = OB_ERR_SYS;
STORAGE_LOG(WARN, "error unexpected, task must not be NULL", K(ret));
} else if (task == first_retry_task) {
// add the task back to the queue
@ -341,4 +342,4 @@ int ObDDLReplicaBuilder::push_task(ObAsyncTask &task)
}
} // end namespace share
} // end namespace oceanbase
} // end namespace oceanbase

2
src/share/resource_manager/ob_cgroup_ctrl.cpp
View File

@ -212,7 +212,7 @@ int ObCgroupCtrl::recursion_process_group_(const char *curr_path, DirProcessor *
DIR *dir = nullptr;
if (NULL == (dir = opendir(curr_path))){
ret = OB_ERR_UNEXPECTED;
LOG_WARN("open dir failed", K(curr_path));
LOG_WARN("open dir failed", K(ret), K(curr_path));
} else {
struct dirent *subdir = nullptr;
char sub_path[PATH_BUFSIZE];

2
src/share/scheduler/ob_tenant_dag_scheduler.cpp
View File

@ -1708,8 +1708,10 @@ bool ObTenantDagWorker::get_force_cancel_flag()
if (DWS_FREE == status_ || DWS_STOP == status_) {
COMMON_LOG(WARN, "the status of worker is invalid to get task", K(status_), K(task_));
} else if (OB_ISNULL(task_)) {
// ignore ret
COMMON_LOG(WARN, "worker contains nullptr task");
} else if (OB_ISNULL(dag = task_->get_dag())) {
// ignore ret
COMMON_LOG(WARN, "task does not belong to dag");
} else {
flag = dag->get_force_cancel_flag();

2
src/share/schema/ob_label_se_policy_mgr.cpp
View File

@ -642,7 +642,7 @@ int ObLabelSeCompMgr::add_label_se_component(const ObLabelSeComponentSchema &sch
}
}
if (OB_FAIL(long_name_map_.set_refactored(new_long_name_key,
if (FAILEDx(long_name_map_.set_refactored(new_long_name_key,
new_schema, over_write))) {
LOG_WARN("update hash map failed", K(ret));
} else if (OB_FAIL(short_name_map_.set_refactored(new_short_name_key,

4
src/share/schema/ob_multi_version_schema_service.cpp
View File

@ -3566,10 +3566,12 @@ int ObMultiVersionSchemaService::try_gc_existed_tenant_schema_mgr()
if (ObSchemaService::g_liboblog_mode_) {
// liboblog/agentserver do nothing
} else if (OB_FAIL(try_gc_tenant_schema_mgr_for_fallback(tenant_id))) {
// overwrite ret
LOG_WARN("fail to gc tenant schema mgr for fallback", KR(ret), K(tenant_id));
}
// 3.let schema mgr to free slot's memory
if (OB_FAIL(try_gc_current_allocator(tenant_id, mem_mgr, schema_mgr_cache))) {
// overwrite ret
LOG_WARN("fail to gc current slot", KR(ret), K(tenant_id));
}
}
@ -3608,6 +3610,7 @@ int ObMultiVersionSchemaService::try_gc_another_allocator(
for (int64_t i = 0; OB_SUCC(ret) && i < another_ptrs.count(); i++) {
ObSchemaMgr *tmp_mgr = NULL;
if (OB_ISNULL(another_ptrs.at(i))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("ptrs is null", K(ret), K(tenant_id), K(i));
} else if (FALSE_IT(tmp_mgr = static_cast<ObSchemaMgr *>(another_ptrs.at(i)))) {
} else if (tmp_mgr->get_schema_version() >= local_version) {
@ -3620,6 +3623,7 @@ int ObMultiVersionSchemaService::try_gc_another_allocator(
ObSchemaMgr *eli_schema_mgr = NULL;
for (int64_t i = 0; OB_SUCC(ret) && i < another_ptrs.count(); i++) {
if (OB_ISNULL(another_ptrs.at(i))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("ptrs is null", K(ret), K(tenant_id), K(i));
} else if (FALSE_IT(eli_schema_mgr = static_cast<ObSchemaMgr *>(another_ptrs.at(i)))) {
} else if (OB_FAIL(schema_mgr_cache->try_eliminate_schema_mgr(eli_schema_mgr))) {

2
src/share/schema/ob_priv_sql_service.cpp
View File

@ -1219,7 +1219,7 @@ int ObPrivSqlService::grant_revoke_role(
LOG_WARN("append sql failed, ", K(ret));
}
}
if (OB_FAIL(sql.append_fmt("(now(6), now(6), %lu, %lu, %lu, %ld, %ld, %lu, %lu)",
if (FAILEDx(sql.append_fmt("(now(6), now(6), %lu, %lu, %lu, %ld, %ld, %lu, %lu)",
ObSchemaUtils::get_extract_tenant_id(exec_tenant_id, user_info.get_tenant_id()),
ObSchemaUtils::get_extract_schema_id(exec_tenant_id, grantee_id),
ObSchemaUtils::get_extract_schema_id(exec_tenant_id, role_id),

Some files were not shown because too many files have changed in this diff Show More