diff options
| author | Samuel Just <sam.just@inktank.com> | 2013-05-01 14:56:25 -0700 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2013-05-01 14:56:25 -0700 |
| commit | 3e0ca62b0fb77eb8b6445ff3ec78b7a18705cad8 (patch) | |
| tree | 1c11e6afb08e83cfd5e39a352641d2fa9542edcd /src/osd/OSD.h | |
| parent | dfacd1bd805ebb730b5206c9830b28f47cc7f9cf (diff) | |
| download | ceph-3e0ca62b0fb77eb8b6445ff3ec78b7a18705cad8.tar.gz | |
OSD: cancel_pending_splits needs to cancel all descendants
expand_pg_num() and load_pgs() may result in a pg with children
in pending_splits which also have children in pending_splits (etc).
Signed-off-by: Samuel Just <sam.just@inktank.com>
Diffstat (limited to 'src/osd/OSD.h')
| -rw-r--r-- | src/osd/OSD.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/osd/OSD.h b/src/osd/OSD.h index f894768fbe5..a0b05f0818b 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -398,6 +398,7 @@ public: void mark_split_in_progress(pg_t parent, const set<pg_t> &pgs); void complete_split(const set<pg_t> &pgs); void cancel_pending_splits_for_parent(pg_t parent); + void _cancel_pending_splits_for_parent(pg_t parent); bool splitting(pg_t pgid); void expand_pg_num(OSDMapRef old_map, OSDMapRef new_map); |