Do not bring along empty trace.

1 files changed, 6 insertions, 2 deletions

diff --git a/storage/src/vespa/storage/distributor/persistencemessagetracker.cpp b/storage/src/vespa/storage/distributor/persistencemessagetracker.cpp
index 4e2253ab2fe..bc0baf2faf7 100644
--- a/storage/src/vespa/storage/distributor/persistencemessagetracker.cpp
+++ b/storage/src/vespa/storage/distributor/persistencemessagetracker.cpp
@@ -255,7 +255,9 @@ PersistenceMessageTrackerImpl::sendReply(MessageSender& sender)
 {
     updateMetrics();
     _trace.setStrict(false);
-    _reply->getTrace().getRoot().addChild(_trace);
+    if ( ! _trace.isEmpty()) {
+        _reply->getTrace().getRoot().addChild(_trace);
+    }
     
     sender.sendReply(_reply);
     _reply = std::shared_ptr<api::BucketInfoReply>();
@@ -319,7 +321,9 @@ PersistenceMessageTrackerImpl::updateFromReply(
         api::BucketInfoReply& reply,
         uint16_t node)
 {
-    _trace.addChild(reply.getTrace().getRoot());
+    if ( ! reply.getTrace().getRoot().isEmpty()) {
+        _trace.addChild(reply.getTrace().getRoot());
+    }
 
     if (reply.getType() == api::MessageType::CREATEBUCKET_REPLY) {
         handleCreateBucketReply(reply, node);