RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 08:57:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #29051 into master

Browse Source 
* refs/pull/29051/head:
	mon/OSDMonitor: tolerate duplicate MRemoveSnaps messages

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
This commit is contained in:
Sage Weil 2019-07-17 11:26:18 -05:00
commit bb32b095a1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mon/OSDMonitor.cc
View File

@ -3723,7 +3723,9 @@ bool OSDMonitor::prepare_remove_snaps(MonOpRequestRef op)
for (auto s : snaps) {
if (!_is_removed_snap(pool, s) &&
(!pending_inc.new_pools.count(pool) ||
!pending_inc.new_pools[pool].removed_snaps.contains(s))) {
!pending_inc.new_pools[pool].removed_snaps.contains(s)) &&
(!pending_inc.new_removed_snaps.count(pool) ||
!pending_inc.new_removed_snaps[pool].contains(s))) {
pg_pool_t *newpi = pending_inc.get_new_pool(pool, &pi);
if (osdmap.require_osd_release < ceph_release_t::octopus) {
newpi->removed_snaps.insert(s);