tools/rbd: adding newline operation when only '--format' used

Signed-off-by: songweibin <song.weibin@zte.com.cn>

src/common/Formatter.cc

@@ -322,6 +322,8 @@ void XMLFormatter::flush(std::ostream& os)
   finish_pending_string();
   std::string m_ss_str = m_ss.str();
   os << m_ss_str;
+  if (!m_pretty)
+    os << "\n";
   /* There is a small catch here. If the rest of the formatter had NO output,
    * we should NOT output a newline. This primarily triggers on HTTP redirects */
   if (m_pretty && !m_ss_str.empty())

src/tools/rbd/action/Children.cc

@@ -86,6 +86,9 @@ int execute(const po::variables_map &vm) {
               << std::endl;
     return r;
   }
+
+  if (formatter.get() && !vm[at::PRETTY_FORMAT].as<bool>())
+    std::cout << std::endl;
   return 0;
 }
 

src/tools/rbd/action/Diff.cc

@@ -127,6 +127,9 @@ int execute(const po::variables_map &vm) {
     std::cerr << "rbd: diff error: " << cpp_strerror(r) << std::endl;
     return -r;
   }
+
+  if (formatter.get() && !vm[at::PRETTY_FORMAT].as<bool>())
+    std::cout << std::endl;
   return 0;
 }
 

src/tools/rbd/action/DiskUsage.cc

@@ -283,9 +283,12 @@ int execute(const po::variables_map &vm) {
                     from_snap_name.empty() ? nullptr : from_snap_name.c_str(),
                     formatter.get());
   if (r < 0) {
-    std::cerr << "du failed: " << cpp_strerror(r) << std::endl;
+    std::cerr << "rbd: du failed: " << cpp_strerror(r) << std::endl;
     return r;
   }
+
+  if (formatter.get() && !vm[at::PRETTY_FORMAT].as<bool>())
+    std::cout << std::endl;
   return 0;
 }
 

src/tools/rbd/action/Group.cc

@@ -83,6 +83,8 @@ int execute_list(const po::variables_map &vm) {
   if (f) {
     f->close_section();
     f->flush(std::cout);
+    if (!vm[at::PRETTY_FORMAT].as<bool>())
+      std::cout << std::endl;
   }
 
   return 0;
@@ -306,6 +308,8 @@ int execute_list_images(const po::variables_map &vm) {
   if (f) {
     f->close_section();
     f->flush(std::cout);
+    if (!vm[at::PRETTY_FORMAT].as<bool>())
+      std::cout << std::endl;
   }
 
   return 0;

src/tools/rbd/action/ImageMeta.cc

@@ -156,6 +156,9 @@ int execute_list(const po::variables_map &vm) {
               << std::endl;
     return r;
   }
+
+  if (formatter.get() && !vm[at::PRETTY_FORMAT].as<bool>())
+    std::cout << std::endl;
   return 0;
 }
 

src/tools/rbd/action/Info.cc

@@ -373,6 +373,9 @@ int execute(const po::variables_map &vm) {
     std::cerr << "rbd: info: " << cpp_strerror(r) << std::endl;
     return r;
   }
+
+  if (formatter.get() && !vm[at::PRETTY_FORMAT].as<bool>())
+    std::cout << std::endl;
   return 0;
 }
 

src/tools/rbd/action/Journal.cc

@@ -838,6 +838,9 @@ int execute_info(const po::variables_map &vm) {
     std::cerr << "rbd: journal info: " << cpp_strerror(r) << std::endl;
     return r;
   }
+
+  if (formatter.get() && !vm[at::PRETTY_FORMAT].as<bool>())
+    std::cout << std::endl;
   return 0;
 
 }
@@ -876,6 +879,9 @@ int execute_status(const po::variables_map &vm) {
     std::cerr << "rbd: journal status: " << cpp_strerror(r) << std::endl;
     return r;
   }
+
+  if (formatter.get() && !vm[at::PRETTY_FORMAT].as<bool>())
+    std::cout << std::endl;
   return 0;
 }
 

src/tools/rbd/action/Kernel.cc

@@ -380,6 +380,9 @@ int execute_show(const po::variables_map &vm) {
     std::cerr << "rbd: showmapped failed: " << cpp_strerror(r) << std::endl;
     return r;
   }
+
+  if (formatter.get() && !vm[at::PRETTY_FORMAT].as<bool>())
+    std::cout << std::endl;
   return 0;
 }
 

src/tools/rbd/action/List.cc

@@ -217,6 +217,8 @@ int execute(const po::variables_map &vm) {
     return r;
   }
 
+  if (formatter.get() && !vm[at::PRETTY_FORMAT].as<bool>())
+    std::cout << std::endl;
   return 0;
 }
 

src/tools/rbd/action/Lock.cc

@@ -141,6 +141,9 @@ int execute_list(const po::variables_map &vm) {
     std::cerr << "rbd: listing locks failed: " << cpp_strerror(r) << std::endl;
     return r;
   }
+
+  if (formatter.get() && !vm[at::PRETTY_FORMAT].as<bool>())
+    std::cout << std::endl;
   return 0;
 }
 

src/tools/rbd/action/MirrorImage.cc

@@ -241,6 +241,8 @@ int execute_status(const po::variables_map &vm) {
     formatter->dump_string("last_update", last_update);
     formatter->close_section(); // image
     formatter->flush(std::cout);
+    if (!vm[at::PRETTY_FORMAT].as<bool>())
+      std::cout << std::endl;
   } else {
     std::cout << image_name << ":\n"
 	      << "  global_id:   " << status.info.global_id << "\n"

src/tools/rbd/action/MirrorPool.cc

@@ -803,6 +803,8 @@ int execute_info(const po::variables_map &vm) {
   if (formatter != nullptr) {
     formatter->close_section();
     formatter->flush(std::cout);
+    if (!vm[at::PRETTY_FORMAT].as<bool>())
+      std::cout << std::endl;
   }
   return 0;
 }
@@ -907,6 +909,8 @@ int execute_status(const po::variables_map &vm) {
   if (formatter != nullptr) {
     formatter->close_section(); // status
     formatter->flush(std::cout);
+    if (!vm[at::PRETTY_FORMAT].as<bool>())
+      std::cout << std::endl;
   }
 
   return ret;

src/tools/rbd/action/Snap.cc

@@ -242,6 +242,9 @@ int execute_list(const po::variables_map &vm) {
          << std::endl;
     return r;
   }
+
+  if (formatter.get() && !vm[at::PRETTY_FORMAT].as<bool>())
+    std::cout << std::endl;
   return 0;
 }
 

src/tools/rbd/action/Status.cc

@@ -117,6 +117,9 @@ int execute(const po::variables_map &vm) {
     std::cerr << "rbd: show status failed: " << cpp_strerror(r) << std::endl;
     return r;
   }
+
+  if (formatter.get() && !vm[at::PRETTY_FORMAT].as<bool>())
+    std::cout << std::endl;
   return 0;
 }
 

src/tools/rbd/action/Trash.cc

@@ -297,6 +297,8 @@ int execute_list(const po::variables_map &vm) {
     return r;
   }
 
+  if (formatter.get() && !vm[at::PRETTY_FORMAT].as<bool>())
+    std::cout << std::endl;
   return 0;
 }