From: Sage Weil <sage@redhat.com>
Date: Tue, 2 May 2017 15:48:02 +0000 (-0500)
Subject: mon/OSDMonitor: fix prime_pg_temp vs creating condition
X-Git-Tag: v12.0.3~113^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=003113ff671fe3758483dc14d29416a56d2b9b9d;p=ceph.git

mon/OSDMonitor: fix prime_pg_temp vs creating condition

We want to *skip* creating PGs.

Fixes: http://tracker.ceph.com/issues/19826
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 3a95d32a54c..08f616dc91f 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1067,12 +1067,12 @@ void OSDMonitor::prime_pg_temp(
 {
   if (mon->monmap->get_required_features().contains_all(
         ceph::features::mon::FEATURE_LUMINOUS)) {
-    if (!creating_pgs.pgs.count(pgid)) {
+    if (creating_pgs.pgs.count(pgid)) {
       return;
     }
   } else {
     const auto& pg_map = mon->pgmon()->pg_map;
-    if (!pg_map.creating_pgs.count(pgid)) {
+    if (pg_map.creating_pgs.count(pgid)) {
       return;
     }
   }