From 9f89ae7c103e2480d9855fb43c97798795b37ec9 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 17 Sep 2015 17:13:17 -0400 Subject: [PATCH] mon/PGMonitor: avoid useless register_new_pgs work Signed-off-by: Sage Weil --- src/mon/PGMonitor.cc | 9 ++++----- src/osd/OSD.cc | 4 ++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc index 9c6eefcf35cb1..2a73700fd1e11 100644 --- a/src/mon/PGMonitor.cc +++ b/src/mon/PGMonitor.cc @@ -1087,13 +1087,12 @@ bool PGMonitor::register_new_pgs() } } + // we don't want to redo this work if we can avoid it. + pending_inc.pg_scan = epoch; + dout(10) << "register_new_pgs registered " << created << " new pgs, removed " << removed << " uncreated pgs" << dendl; - if (created || removed) { - pending_inc.pg_scan = epoch; - return true; - } - return false; + return (created || removed); } void PGMonitor::map_pg_creates() diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 0572410e3c51f..0e6d59468119b 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -4350,6 +4350,10 @@ void OSD::ms_handle_connect(Connection *con) if (is_booting()) { start_boot(); } else { + utime_t now = ceph_clock_now(NULL); + last_mon_report = now; + + // resend everything, it's a new session send_alive(); service.send_pg_temp(); send_failures(); -- 2.39.5