]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #40129 into pacific
authorSage Weil <sage@newdream.net>
Sun, 21 Mar 2021 14:38:49 +0000 (09:38 -0500)
committerSage Weil <sage@newdream.net>
Sun, 21 Mar 2021 14:38:49 +0000 (09:38 -0500)
* refs/pull/40129/head:
osd: PeeringState: implement an acting_set_writeable() function
osd: PeeringState: fix a boolean conditional direction
osd: PeeringState: fix stretch peering so PGs can go peered but not active
osd: PeeringState: don't add acting-set OSDs to candidate set in stretch mode
osd: PeeringState: fix calc_replicated_acting_stretch() syntax/logic
osd: PeeringState: respect stretch peering constraints for async recovery
osd: PeeringState: add a comment about using size as a proxy for activateable
osd: check for is_stretch_pool() in stretch_set_can_peer()
scripts: some additions to help with local testing
script: set_up_stretch_mode: include OSDs in root=default so pg creation works

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Trivial merge