RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 09:32:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41604 from t-msn/wip-51030

Browse Source 
osd/ECBackend: Fix null pointer dereference when enabling jaeger tracing

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
This commit is contained in:
Kefu Chai 2021-06-05 21:33:00 +08:00 committed by GitHub
commit 4857c35084
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osd/ECBackend.cc
View File

@ -941,7 +941,7 @@ void ECBackend::handle_sub_write(
msg->mark_event("sub_op_started");
trace.event("handle_sub_write");
#ifdef HAVE_JAEGER
if (msg->osd_parent_span) {
if (msg && msg->osd_parent_span) {
auto ec_sub_trans = jaeger_tracing::child_span(__func__, msg->osd_parent_span);
}
#endif
@ -1544,7 +1544,7 @@ void ECBackend::submit_transaction(
op->trace = client_op->pg_trace;
#ifdef HAVE_JAEGER
if (client_op->osd_parent_span) {
if (client_op && client_op->osd_parent_span) {
auto ec_sub_trans = jaeger_tracing::child_span("ECBackend::submit_transaction", client_op->osd_parent_span);
}
#endif
@ -2118,7 +2118,7 @@ bool ECBackend::try_reads_to_commit()
}
#ifdef HAVE_JAEGER
if (op->client_op->osd_parent_span) {
if (op->client_op && op->client_op->osd_parent_span) {
auto sub_write_span = jaeger_tracing::child_span("EC sub write", op->client_op->osd_parent_span);
}
#endif