]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mon/OSDMonitor: fix safety/idempotency of {set,rm}-device-class 40276/head
authorSage Weil <sage@newdream.net>
Wed, 24 Feb 2021 20:59:57 +0000 (14:59 -0600)
committersinguliere <singuliere@autistici.org>
Sat, 20 Mar 2021 08:02:23 +0000 (09:02 +0100)
commitca4cd4a4860efb50555644960c77c07414acb6af
tree5c9a18669bcfb940e318f5c60cf247c46a93875e
parent23bf957ebb921ee424760735adbe8a6f796fd5e0
mon/OSDMonitor: fix safety/idempotency of {set,rm}-device-class

If the command is resent (e.g., due to network reconnect), the second
instance may find that the pending crush map already has the changes
and not wait for it to commit.

Note that the stderr message will be misleading in this case; that is a
problem with most of our mon commands.  :(

Fixes: https://tracker.ceph.com/issues/49212
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit db6c8f9ab32a7bc0dc8bca94f79812bfb9e7b123)

 Conflicts:
src/mon/OSDMonitor.cc
only because mon. in master is mon-> in octopus
src/mon/OSDMonitor.cc