From e3524e6977c2fe10ade952a2c1837908b03f062b Mon Sep 17 00:00:00 2001 From: Victor Araujo Date: Mon, 5 Sep 2016 14:15:03 +0200 Subject: [PATCH] filestore: Initialize Zipkin traces when there is a store trace Avoids creating orphaned traces. Signed-off-by: Victor Araujo --- src/os/filestore/FileJournal.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/os/filestore/FileJournal.cc b/src/os/filestore/FileJournal.cc index bf13c44cadd..7e6a19cbf0e 100644 --- a/src/os/filestore/FileJournal.cc +++ b/src/os/filestore/FileJournal.cc @@ -1623,9 +1623,11 @@ void FileJournal::submit_entry(uint64_t seq, bufferlist& e, uint32_t orig_len, if (osd_op) { osd_op->mark_event("commit_queued_for_journal_write"); - osd_op->journal_trace.init("journal", &trace_endpoint, &osd_op->store_trace); - osd_op->journal_trace.event("submit_entry"); - osd_op->journal_trace.keyval("seq", seq); + if (osd_op->store_trace) { + osd_op->journal_trace.init("journal", &trace_endpoint, &osd_op->store_trace); + osd_op->journal_trace.event("submit_entry"); + osd_op->journal_trace.keyval("seq", seq); + } } { Mutex::Locker l1(writeq_lock); -- 2.39.5