diff options
| author | Samuel Just <rexludorum@gmail.com> | 2024-01-26 21:23:03 +0100 |
|---|---|---|
| committer | Samuel Just <sjust@redhat.com> | 2024-01-26 21:32:05 +0100 |
| commit | a5ce9c3863f98992193a9913344a046112c28dea (patch) | |
| tree | 2582ce1ca84c0690c7a2bb33112e2d1de08588ac /src/mon | |
| parent | Merge pull request #55096 from athanatos/sjust/for-review/wip-crush-msr (diff) | |
| download | ceph-a5ce9c3863f98992193a9913344a046112c28dea.tar.xz ceph-a5ce9c3863f98992193a9913344a046112c28dea.zip | |
Revert "crush: add multistep retry rules"
This PR was merged by accident before it was ready.
Let's revert for now and open a new PR.
Signed-off-by: Samuel Just <sjust@redhat.com>
Diffstat (limited to 'src/mon')
| -rw-r--r-- | src/mon/OSDMonitor.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 696d7f3185b..f8e379326f2 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -7562,12 +7562,6 @@ bool OSDMonitor::validate_crush_against_features(const CrushWrapper *newcrush, << newmap.require_min_compat_client; return false; } - if (mv > newmap.require_osd_release) { - ss << "new crush map requires client version " << mv - << " but require_osd_release is " - << newmap.require_osd_release; - return false; - } } // osd compat @@ -8078,7 +8072,7 @@ int OSDMonitor::prepare_new_pool(string& name, return r; } - if (!osdmap.crush->rule_valid_for_pool_type(crush_rule, pool_type)) { + if (osdmap.crush->get_rule_type(crush_rule) != (int)pool_type) { *ss << "crush rule " << crush_rule << " type does not match pool"; return -EINVAL; } @@ -8350,7 +8344,7 @@ int OSDMonitor::prepare_command_pool_set(const cmdmap_t& cmdmap, return -EPERM; } } - if (!osdmap.crush->rule_valid_for_pool_type(p.get_crush_rule(), p.type)) { + if (osdmap.crush->get_rule_type(p.get_crush_rule()) != (int)p.type) { ss << "crush rule " << p.get_crush_rule() << " type does not match pool"; return -EINVAL; } @@ -8583,7 +8577,7 @@ int OSDMonitor::prepare_command_pool_set(const cmdmap_t& cmdmap, ss << cpp_strerror(id); return -ENOENT; } - if (!osdmap.crush->rule_valid_for_pool_type(id, p.get_type())) { + if (osdmap.crush->get_rule_type(id) != (int)p.get_type()) { ss << "crush rule " << id << " type does not match pool"; return -EINVAL; } |