From: Sage Weil <sage@redhat.com>
Date: Fri, 14 Jun 2019 21:23:21 +0000 (-0500)
Subject: osd: copy (don't move) pg list when sending beacon
X-Git-Tag: v14.2.3~96^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=bf68d8e54e95cd9ef740f818ae2dae3c5756a2f4;p=ceph.git

osd: copy (don't move) pg list when sending beacon

If we move the list, then a second beacon sent before the pg list refreshes
will be empty.

Fixes: http://tracker.ceph.com/issues/40377
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit f2f6e170de100cb57d06e4b9a3dbba65530f745f)
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index abfdde2f30ba5..b30e84a8fb29e 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -6298,7 +6298,7 @@ void OSD::send_beacon(const ceph::coarse_mono_clock::time_point& now)
     {
       std::lock_guard l{min_last_epoch_clean_lock};
       beacon = new MOSDBeacon(osdmap->get_epoch(), min_last_epoch_clean);
-      std::swap(beacon->pgs, min_last_epoch_clean_pgs);
+      beacon->pgs = min_last_epoch_clean_pgs;
       last_sent_beacon = now;
     }
     monc->send_mon_message(beacon);