import quincy beta 17.1.0

[ceph.git] / ceph / src / librbd / cache / pwl / LogOperation.cc

diff --git a/ceph/src/librbd/cache/pwl/LogOperation.cc b/ceph/src/librbd/cache/pwl/LogOperation.cc
index 4fc13a91a23f2d8debe40bb05e234c813db3740e..e779802f0cf8be45d6d67eb777aca56940b4cb56 100644 (file)
--- a/ceph/src/librbd/cache/pwl/LogOperation.cc
+++ b/ceph/src/librbd/cache/pwl/LogOperation.cc
@@ -20,11 +20,11 @@ GenericLogOperation::GenericLogOperation(utime_t dispatch_time,
 }
 
 std::ostream& GenericLogOperation::format(std::ostream &os) const {
-  os << "dispatch_time=[" << dispatch_time << "], "
-     << "buf_persist_start_time=[" << buf_persist_start_time << "], "
-     << "buf_persist_comp_time=[" << buf_persist_comp_time << "], "
-     << "log_append_start_time=[" << log_append_start_time << "], "
-     << "log_append_comp_time=[" << log_append_comp_time << "], ";
+  os << "dispatch_time=[" << dispatch_time
+     << "], buf_persist_start_time=[" << buf_persist_start_time
+     << "], buf_persist_comp_time=[" << buf_persist_comp_time
+     << "], log_append_start_time=[" << log_append_start_time
+     << "], log_append_comp_time=[" << log_append_comp_time << "]";
   return os;
 }
 
@@ -47,8 +47,7 @@ SyncPointLogOperation::~SyncPointLogOperation() { }
 std::ostream &SyncPointLogOperation::format(std::ostream &os) const {
   os << "(Sync Point) ";
   GenericLogOperation::format(os);
-  os << ", "
-     << "sync_point=[" << *sync_point << "]";
+  os << ", sync_point=[" << *sync_point << "]";
   return os;
 }
 
@@ -204,17 +203,15 @@ void WriteLogOperation::init(bool has_data, std::vector<WriteBufferAllocation>::
 }
 
 std::ostream &WriteLogOperation::format(std::ostream &os) const {
-  string op_name = is_writesame ? "(Write Same) " : "(Write) ";
+  std::string op_name = is_writesame ? "(Write Same) " : "(Write) ";
   os << op_name;
   GenericWriteLogOperation::format(os);
-  os << ", ";
   if (log_entry) {
-    os << "log_entry=[" << *log_entry << "], ";
+    os << ", log_entry=[" << *log_entry << "]";
   } else {
-    os << "log_entry=nullptr, ";
+    os << ", log_entry=nullptr";
   }
-  os << "bl=[" << bl << "],"
-     << "buffer_alloc=" << buffer_alloc;
+  os << ", bl=[" << bl << "], buffer_alloc=" << buffer_alloc;
   return os;
 }
 
@@ -269,9 +266,9 @@ WriteLogOperationSet::~WriteLogOperationSet() { }
 
 std::ostream &operator<<(std::ostream &os,
                          const WriteLogOperationSet &s) {
-  os << "cell=" << (void*)s.cell << ", "
-     << "extent_ops_appending=[" << s.extent_ops_appending << ", "
-     << "extent_ops_persist=[" << s.extent_ops_persist << "]";
+  os << "cell=" << (void*)s.cell
+     << ", extent_ops_appending=" << s.extent_ops_appending
+     << ", extent_ops_persist=" << s.extent_ops_persist;
   return os;
 }
 
@@ -297,11 +294,10 @@ DiscardLogOperation::~DiscardLogOperation() { }
 std::ostream &DiscardLogOperation::format(std::ostream &os) const {
   os << "(Discard) ";
   GenericWriteLogOperation::format(os);
-  os << ", ";
   if (log_entry) {
-    os << "log_entry=[" << *log_entry << "], ";
+    os << ", log_entry=[" << *log_entry << "]";
   } else {
-    os << "log_entry=nullptr, ";
+    os << ", log_entry=nullptr";
   }
   return os;
 }