import ceph nautilus 14.2.2

[ceph.git] / ceph / src / mon / Monitor.cc

diff --git a/ceph/src/mon/Monitor.cc b/ceph/src/mon/Monitor.cc
index 37af8574bab48a557cdc0482e8d9eb4500dd3309..ec6b58f39822bc298c7fc8c12f999600c25e27b8 100644 (file)
--- a/ceph/src/mon/Monitor.cc
+++ b/ceph/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;
@@ -1849,9 +1850,11 @@ void Monitor::handle_probe_probe(MonOpRequestRef op)
   dout(10) << "handle_probe_probe " << m->get_source_inst() << *m
           << " 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
+  if ((m->mon_release > 0 && m->mon_release < monmap->min_mon_release) ||
+      missing) {
+    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);
@@ -3020,7 +3023,7 @@ void Monitor::get_cluster_status(stringstream &ss, Formatter *f)
        ss << "    " << i.second.message << "\n";
        ss << "      [";
        unsigned j;
-       for (j=0; j < i.second.progress * 30; ++j) {
+       for (j = 0; j < (unsigned)(i.second.progress * 30.0); ++j) {
          ss << '=';
        }
        for (; j < 30; ++j) {