From: Sage Weil <sage@newdream.net>
Date: Thu, 4 Mar 2021 21:08:14 +0000 (-0500)
Subject: Merge PR #39832 into master
X-Git-Tag: v17.1.0~2740
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d07cff2aa68a9930943a4f4ae053ea9b8b98dc7a;p=ceph.git

Merge PR #39832 into master

* refs/pull/39832/head:
	mgr/DaemonServer: osd ok-to-stop: return json when there are unknown PGs

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

d07cff2aa68a9930943a4f4ae053ea9b8b98dc7a
diff --cc src/mgr/DaemonServer.cc
index bf37173c3121,b70ea066680e..f665d28304ba
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@@ -1757,8 -1753,13 +1753,13 @@@ bool DaemonServer::_handle_command
      f->dump_object("ok_to_stop", out_report);
      f->flush(cmdctx->odata);
      cmdctx->odata.append("\n");
+     if (!out_report.unknown.empty()) {
+       ss << out_report.unknown.size() << " pgs have unknown state; "
+ 	 << "cannot draw any conclusions";
+       cmdctx->reply(-EAGAIN, ss);
+     }
      if (!out_report.ok_to_stop()) {
 -      ss << "unsafe to stop osd(s)";
 +      ss << "unsafe to stop osd(s) at this time (" << out_report.not_ok.size() << " PGs are or would become offline)";
        cmdctx->reply(-EBUSY, ss);
      } else {
        cmdctx->reply(0, ss);