mon: fix min_mon_release print

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit dcde01e3068d5d52da61323aa5b20b3bc14f7280)

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 37af8574bab48a557cdc0482e8d9eb4500dd3309..04ca4fcbc6131b4ad8b187ad16490e582b739138 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1833,8 +1833,9 @@ void Monitor::handle_probe(MonOpRequestRef op)
     break;
 
   case MMonProbe::OP_MISSING_FEATURES:
-    derr << __func__ << " require release " << m->mon_release << " > "
-        << ceph_release() << ", or missing features (have " << CEPH_FEATURES_ALL
+    derr << __func__ << " require release " << (int)m->mon_release << " > "
+        << (int)ceph_release()
+        << ", or missing features (have " << CEPH_FEATURES_ALL
         << ", required " << m->required_features
         << ", missing " << (m->required_features & ~CEPH_FEATURES_ALL) << ")"
         << dendl;
@@ -1850,8 +1851,9 @@ void Monitor::handle_probe_probe(MonOpRequestRef op)
           << " features " << m->get_connection()->get_features() << dendl;
   uint64_t missing = required_features & ~m->get_connection()->get_features();
   if (m->mon_release < monmap->min_mon_release || missing) {
-    dout(1) << " peer " << m->get_source_addr() << " release " << m->mon_release
-           << " < min_mon_release " << monmap->min_mon_release
+    dout(1) << " peer " << m->get_source_addr()
+           << " release " << (int)m->mon_release
+           << " < min_mon_release " << (int)monmap->min_mon_release
            << ", or missing features " << missing << dendl;
     MMonProbe *r = new MMonProbe(monmap->fsid, MMonProbe::OP_MISSING_FEATURES,
                                 name, has_ever_joined, monmap->min_mon_release);

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index 800da05ad94d72dbdbc464b87f53ec7d35ecce94..76356807c3ae0eaa90da87cd506999e9a27d29ce 100644 (file)
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -165,7 +165,7 @@ void MonmapMonitor::apply_mon_features(const mon_feature_t& features,
 
   if (new_features.empty() &&
       pending_map.min_mon_release == min_mon_release) {
-    dout(10) << __func__ << " min_mon_release (" << min_mon_release
+    dout(10) << __func__ << " min_mon_release (" << (int)min_mon_release
             << ") and features (" << features << ") match" << dendl;
     return;
   }
@@ -180,7 +180,7 @@ void MonmapMonitor::apply_mon_features(const mon_feature_t& features,
   }
   if (min_mon_release > pending_map.min_mon_release) {
     dout(1) << __func__ << " increasing min_mon_release to "
-           << min_mon_release << " (" << ceph_release_name(min_mon_release)
+           << (int)min_mon_release << " (" << ceph_release_name(min_mon_release)
            << ")" << dendl;
     pending_map.min_mon_release = min_mon_release;
   }