From dcde01e3068d5d52da61323aa5b20b3bc14f7280 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 27 Apr 2019 10:55:57 -0500 Subject: [PATCH] mon: fix min_mon_release print Signed-off-by: Sage Weil --- src/mon/Monitor.cc | 10 ++++++---- src/mon/MonmapMonitor.cc | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 55231f60bf6..54b170c7e66 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -1834,8 +1834,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; @@ -1851,8 +1852,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 f15a36185df..3b4c4345774 100644 --- 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; } -- 2.39.5