]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/OSDMonitor: behave if inc map sets weight on not-yet-existing OSD
authorSage Weil <sage@newdream.net>
Wed, 24 Feb 2021 22:05:55 +0000 (17:05 -0500)
committerSage Weil <sage@newdream.net>
Mon, 1 Mar 2021 00:01:01 +0000 (18:01 -0600)
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 678dc40cb2772340f6e3764825f5a3ee17cac9ec)

src/mon/OSDMonitor.cc

index a0d0a6c5858e38a007cb3d4e2a9ebf25a9799897..86bd4a0ebe7289c2bec567543dc640b581438f1c 100644 (file)
@@ -1425,7 +1425,7 @@ void OSDMonitor::maybe_prime_pg_temp()
   for (auto p = pending_inc.new_weight.begin();
        !all && p != pending_inc.new_weight.end();
        ++p) {
-    if (p->second < osdmap.get_weight(p->first)) {
+    if (osdmap.exists(p->first) && p->second < osdmap.get_weight(p->first)) {
       // weight reduction
       osds.insert(p->first);
     } else {