]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #39832 into master
authorSage Weil <sage@newdream.net>
Thu, 4 Mar 2021 21:08:14 +0000 (16:08 -0500)
committerSage Weil <sage@newdream.net>
Thu, 4 Mar 2021 21:08:14 +0000 (16:08 -0500)
* 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>
1  2 
src/mgr/DaemonServer.cc

index bf37173c3121b56a646b4f0a8d64b6d4819efa82,b70ea066680e8365e758e5f3e401cd8c72aa40e0..f665d28304ba3512310c0ae5ce53ef83044c0308
@@@ -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);