From 5aadca16f0f1c0281ba08f233bccb512f0187b17 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Fri, 2 Feb 2018 11:59:29 -0600
Subject: [PATCH] mon/OSDMonitor: reject force-create-pg on pgids that
 shouldn't exist

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/mon/OSDMonitor.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 0a6cbad9df9..e6b9279003b 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -10927,6 +10927,11 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
       err = -EINVAL;
       goto reply;
     }
+    if (!osdmap.pg_exists(pgid)) {
+      ss << "pg " << pgid << " should not exist";
+      err = -ENOENT;
+      goto reply;
+    }
     bool creating_now;
     {
       std::lock_guard<std::mutex> l(creating_pgs_lock);
-- 
2.39.5