diff options
| author | Sage Weil <sage@redhat.com> | 2018-09-24 20:03:05 +0200 |
|---|---|---|
| committer | Sage Weil <sage@redhat.com> | 2018-10-20 22:21:58 +0200 |
| commit | 550dcd53bb6db4f6b9d3b941f101332ac17a0168 (patch) | |
| tree | abe650a34ab470d05f0c1fbb6ef26183346fe510 /src/osd/OSDMap.h | |
| parent | mgr/DaemonServer: move pending merge check for more consistent code (diff) | |
| download | ceph-550dcd53bb6db4f6b9d3b941f101332ac17a0168.tar.xz ceph-550dcd53bb6db4f6b9d3b941f101332ac17a0168.zip | |
mgr/DaemonServer: prevent merge if either pg is remapped|upmap
Remapping means they could be on different OSDs.
Fixes: http://tracker.ceph.com/issues/36166
Signed-off-by: Sage Weil <sage@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | src/osd/OSDMap.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h index abaaddb5afa..52f7fd4f883 100644 --- a/src/osd/OSDMap.h +++ b/src/osd/OSDMap.h @@ -1381,6 +1381,11 @@ public: int get_osds_by_bucket_name(const string &name, set<int> *osds) const; + bool have_pg_upmaps(pg_t pg) const { + return pg_upmap.count(pg) || + pg_upmap_items.count(pg); + } + /* * handy helpers to build simple maps... */ |