mon, osd: Fix log messages (missing space, convert int to string)

Binary data was ending up in the log file which could cause
terminals to produce garbage output.

Fixes: http://tracker.ceph.com/issues/38678
Signed-off-by: David Zafman <dzafman@redhat.com>

diff --git a/src/mon/MgrStatMonitor.cc b/src/mon/MgrStatMonitor.cc
index b8f6abf7cdcdf51af48c7f136f6cc87159739325..a9c83c1f7fb0434ad0e824754df91a01f4994eb1 100644 (file)
--- a/src/mon/MgrStatMonitor.cc
+++ b/src/mon/MgrStatMonitor.cc
@@ -198,7 +198,7 @@ bool MgrStatMonitor::prepare_report(MonOpRequestRef op)
   pending_progress_events.swap(m->progress_events);
   dout(10) << __func__ << " " << pending_digest << ", "
           << pending_health_checks.checks.size() << " health checks, "
-          << progress_events.size() << "progress events" << dendl;
+          << progress_events.size() << " progress events" << dendl;
   dout(20) << "pending_digest:\n";
   JSONFormatter jf(true);
   jf.open_object_section("pending_digest");

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 3b5f4e80bfffcd7ec6bee17f90f394d780c45099..49d307024276588dfcb50f51cb4816923c6d03f0 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -8454,7 +8454,7 @@ void OSD::check_osdmap_features()
 
   if (osdmap->require_osd_release != last_require_osd_release) {
     dout(1) << __func__ << " require_osd_release " << last_require_osd_release
-           << " -> " << osdmap->require_osd_release << dendl;
+           << " -> " << to_string(osdmap->require_osd_release) << dendl;
     store->write_meta("require_osd_release", stringify(osdmap->require_osd_release));
     last_require_osd_release = osdmap->require_osd_release;
   }