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

Revert “fix show trace cannot find root span while adaptting upstream”

Browse Source
This commit is contained in:
obdev
2023-03-03 07:11:13 +00:00
committed by ob-robot
parent 158dedccd8
commit e84f946374
1 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/sql/monitor/flt/ob_flt_utils.cpp
View File

@ -133,6 +133,7 @@ namespace sql
session.set_auto_flush_trace(false); session.set_auto_flush_trace(false);
session.set_trace_enable(false); session.set_trace_enable(false);
} }
OZ(ObFLTUtils::init_flt_show_trace_env(session));
return ret; return ret;
} }
@ -411,13 +412,7 @@ namespace sql
sid.deserialize(span_id.ptr(), span_id.length(), pos); sid.deserialize(span_id.ptr(), span_id.length(), pos);
OBTRACE->init(tid, sid); OBTRACE->init(tid, sid);
FLT_SET_TRACE_LEVEL(sess.get_control_info().level_); FLT_SET_TRACE_LEVEL(sess.get_control_info().level_);
if (sess.is_use_trace_log()) {
sess.set_auto_flush_trace(true);
}
FLT_SET_AUTO_FLUSH(sess.is_auto_flush_trace()); FLT_SET_AUTO_FLUSH(sess.is_auto_flush_trace());
char last_trace_id[OB_MAX_UUID_STR_LENGTH + 1];
pos = 0;
sid.tostring(last_trace_id, OB_MAX_UUID_STR_LENGTH + 1, pos);
} }
// update trace_id by server self // update trace_id by server self
} else { } else {
@ -434,9 +429,6 @@ namespace sql
} }
} }
FLT_SET_TRACE_LEVEL(sess.get_control_info().level_); FLT_SET_TRACE_LEVEL(sess.get_control_info().level_);
if (sess.is_use_trace_log()) {
sess.set_auto_flush_trace(true);
}
FLT_SET_AUTO_FLUSH(sess.is_auto_flush_trace()); FLT_SET_AUTO_FLUSH(sess.is_auto_flush_trace());
} }
@ -575,9 +567,7 @@ namespace sql
// record span // record span
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
// do nothing // do nothing
} else { } else if (OB_FAIL(flt_span_manager->record_span(data))) {
while (true) {
if (OB_FAIL(flt_span_manager->record_span(data))) {
if (OB_SIZE_OVERFLOW == ret || OB_ALLOCATE_MEMORY_FAILED == ret) { if (OB_SIZE_OVERFLOW == ret || OB_ALLOCATE_MEMORY_FAILED == ret) {
LOG_TRACE("cannot allocate mem for record", K(ret)); LOG_TRACE("cannot allocate mem for record", K(ret));
ret = OB_SUCCESS; ret = OB_SUCCESS;
@ -587,12 +577,6 @@ namespace sql
} }
} }
} }
// If the slot is full, a certain amount of
// internal space will be released,
// and it needs to be added again
if (ret != OB_ENTRY_NOT_EXIST) break;
}
}
} }
return ret; return ret;
} }