From: Victor Araujo <ve.ar91@gmail.com>
Date: Mon, 5 Sep 2016 12:15:03 +0000 (+0200)
Subject: filestore: Initialize Zipkin traces when there is a store trace
X-Git-Tag: v12.0.3~73^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e3524e6977c2fe10ade952a2c1837908b03f062b;p=ceph.git

filestore: Initialize Zipkin traces when there is a store trace

Avoids creating orphaned traces.

Signed-off-by: Victor Araujo <ve.ar91@gmail.com>
---

diff --git a/src/os/filestore/FileJournal.cc b/src/os/filestore/FileJournal.cc
index bf13c44cadda..7e6a19cbf0e1 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);