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

fix: get ilegal trace id when scheduler run

Browse Source
This commit is contained in:
obdev
2024-10-16 20:47:31 +00:00
committed by ob-robot
parent 69c77f3a85
commit 62f276706f
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/observer/dbms_scheduler/ob_dbms_sched_job_master.cpp
View File

@ -71,7 +71,6 @@ int ObDBMSSchedJobMaster::init(common::ObMySQLProxy *sql_proxy,
LOG_WARN("trace id is null", K(ret));
} else {
tenant_server_cache_.reset();
trace_id_ = ObCurTraceId::get();
self_addr_ = GCONF.self_addr_;
schema_service_ = schema_service;
job_rpc_proxy_ = GCTX.dbms_sched_job_rpc_proxy_;
@ -175,11 +174,7 @@ int ObDBMSSchedJobMaster::scheduler()
if (!inited_) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("not init yet", K(ret));
} else if (OB_ISNULL(trace_id_)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("null trace_id_ ptr", K(ret), K(trace_id_));
} else {
ObCurTraceId::set(trace_id_);
while (OB_SUCC(ret) && !stoped_) {
bool is_leader = is_leader_;
ObLink* ptr = NULL;

2
src/observer/dbms_scheduler/ob_dbms_sched_job_master.h
View File

@ -100,7 +100,6 @@ public:
stoped_(true),
is_leader_(false),
tenant_id_(OB_INVALID_TENANT_ID),
trace_id_(NULL),
rand_(),
schema_service_(NULL),
job_rpc_proxy_(NULL),
@ -153,7 +152,6 @@ private:
bool stoped_;
bool is_leader_;
uint64_t tenant_id_;
const uint64_t *trace_id_;
common::ObRandom rand_; // for random pick server
share::schema::ObMultiVersionSchemaService *schema_service_; // for got all tenant info