]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-osdomap-tool: Fix seg fault with large amount of check error output
authorDavid Zafman <dzafman@redhat.com>
Thu, 16 Feb 2017 00:17:32 +0000 (16:17 -0800)
committerDavid Zafman <dzafman@redhat.com>
Tue, 28 Mar 2017 16:33:37 +0000 (09:33 -0700)
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 1dda0411f4fbb14ce1e0062da9f14ec3af505d39)

src/tools/ceph_osdomap_tool.cc

index 11d984e330522458d07db5fb3c1f9ec0cc2bf437..57cc3ecc01925b6732aaf8417c7685d7a5bd8fec 100644 (file)
@@ -161,9 +161,11 @@ int main(int argc, char **argv) {
       }
     }
   } else if (cmd == "check" || cmd == "repair") {
+    ostringstream ss;
     bool repair = (cmd == "repair");
-    r = omap.check(std::cout, repair);
+    r = omap.check(ss, repair);
     if (r > 0) {
+      std::cerr << ss.str() << std::endl;
       std::cerr << "check got " << r << " error(s)" << std::endl;
       r = 1;
       goto done;