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

[CP] fix core when timezone info deserialize

Browse Source
This commit is contained in:
obdev
2023-07-03 03:47:59 +00:00
committed by ob-robot
parent ee34cba0bb
commit 2f62b5283b
6 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/sql/session/ob_basic_session_info.cpp
View File

@ -147,8 +147,8 @@ ObBasicSessionInfo::ObBasicSessionInfo(const uint64_t tenant_id)
labels_(),
thread_id_(0),
is_password_expired_(false),
process_query_time_(0)
process_query_time_(0),
last_update_tz_time_(0)
{
thread_data_.reset();
MEMSET(sys_vars_, 0, sizeof(sys_vars_));
@ -424,6 +424,7 @@ void ObBasicSessionInfo::reset(bool skip_sys_var)
thread_id_ = 0;
is_password_expired_ = false;
process_query_time_ = 0;
last_update_tz_time_ = 0;
sess_bt_buff_pos_ = 0;
ATOMIC_SET(&sess_ref_cnt_ , 0);
// 最后再重置所有allocator
@ -5963,31 +5964,38 @@ int ObBasicSessionInfo::set_time_zone(const ObString &str_val, const bool is_ora
int ObBasicSessionInfo::update_timezone_info()
{
int ret = OB_SUCCESS;
ObTZMapWrap tz_map_wrap;
ObTimeZoneInfoManager *tz_info_mgr = NULL;
if (OB_FAIL(OTTZ_MGR.get_tenant_timezone(tenant_id_, tz_map_wrap, tz_info_mgr))) {
LOG_WARN("get tenant timezone with lock failed", K(ret));
} else if (OB_ISNULL(tz_info_mgr)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("tenant timezone mgr is null", K(tz_info_mgr));
} else if (OB_UNLIKELY(tz_info_wrap_.is_position_class()
&& tz_info_mgr->get_version() > tz_info_wrap_.get_cur_version())) {
ObString tz_name;
if (OB_UNLIKELY(!tz_info_wrap_.get_tz_info_pos().is_valid())) {
const int64_t UPDATE_PERIOD = 1000 * 1000 * 5; //5s
int64_t cur_time = ObTimeUtility::current_time();
if (cur_time - last_update_tz_time_ > UPDATE_PERIOD) {
ObTZMapWrap tz_map_wrap;
ObTimeZoneInfoManager *tz_info_mgr = NULL;
if (OB_FAIL(OTTZ_MGR.get_tenant_timezone(tenant_id_, tz_map_wrap, tz_info_mgr))) {
LOG_WARN("get tenant timezone with lock failed", K(ret));
} else if (OB_ISNULL(tz_info_mgr)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("time zone info is invalid", K(tz_info_wrap_.get_tz_info_pos()), K(ret));
} else if (OB_FAIL(tz_info_wrap_.get_tz_info_pos().get_tz_name(tz_name))) {
LOG_WARN("fal to get time zone name", K(tz_info_wrap_.get_tz_info_pos()), K(ret));
} else {//此处需要先更新version，这样可以保证find到的tz_info version >= cur_version
int64_t orig_version = tz_info_wrap_.get_cur_version();
tz_info_wrap_.set_cur_version(tz_info_mgr->get_version());
if (OB_FAIL(tz_info_mgr->find_time_zone_info(tz_name, tz_info_wrap_.get_tz_info_pos()))) {
LOG_WARN("fail to find time zone info", K(tz_name), K(ret));
tz_info_wrap_.set_cur_version(orig_version);
} else {
tz_info_wrap_.get_tz_info_pos().set_error_on_overlap_time(tz_info_wrap_.is_error_on_overlap_time());
LOG_WARN("tenant timezone mgr is null", K(tz_info_mgr));
} else if (OB_UNLIKELY(tz_info_wrap_.is_position_class()
&& tz_info_mgr->get_version() > tz_info_wrap_.get_cur_version())) {
ObString tz_name;
if (OB_UNLIKELY(!tz_info_wrap_.get_tz_info_pos().is_valid())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("time zone info is invalid", K(tz_info_wrap_.get_tz_info_pos()), K(ret));
} else if (OB_FAIL(tz_info_wrap_.get_tz_info_pos().get_tz_name(tz_name))) {
LOG_WARN("fal to get time zone name", K(tz_info_wrap_.get_tz_info_pos()), K(ret));
} else {//此处需要先更新version，这样可以保证find到的tz_info version >= cur_version
int64_t orig_version = tz_info_wrap_.get_cur_version();
tz_info_wrap_.set_cur_version(tz_info_mgr->get_version());
if (OB_FAIL(tz_info_mgr->find_time_zone_info(tz_name, tz_info_wrap_.get_tz_info_pos()))) {
LOG_WARN("fail to find time zone info", K(tz_name), K(ret));
tz_info_wrap_.set_cur_version(orig_version);
} else {
tz_info_wrap_.get_tz_info_pos().set_error_on_overlap_time(tz_info_wrap_.is_error_on_overlap_time());
}
}
}
if (OB_SUCC(ret)) {
last_update_tz_time_ = cur_time;
}
}
return ret;
}

1
src/sql/session/ob_basic_session_info.h
View File

@ -2202,6 +2202,7 @@ private:
bool is_password_expired_;
// timestamp of processing current query. refresh when retry.
int64_t process_query_time_;
int64_t last_update_tz_time_; //timestamp of last attempt to update timezone info
};

2
src/sql/session/ob_sql_session_info.cpp
View File

@ -2459,8 +2459,6 @@ void ObSQLSessionInfo::ObCachedTenantConfigInfo::refresh()
// 7. print_sample_ppm_ for flt
ATOMIC_STORE(&print_sample_ppm_, tenant_config->_print_sample_ppm);
}
//timezone的更新频率非常低，放到后台驱动
(void)session_->update_timezone_info();
ATOMIC_STORE(&last_check_ec_ts_, cur_ts);
session_->update_tenant_config_version(
(::oceanbase::omt::ObTenantConfigMgr::get_instance()).get_tenant_config_version(effective_tenant_id));