]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #24064 into master
authorSage Weil <sage@redhat.com>
Fri, 21 Sep 2018 13:21:33 +0000 (08:21 -0500)
committerSage Weil <sage@redhat.com>
Fri, 21 Sep 2018 13:21:33 +0000 (08:21 -0500)
commite496446034ba30064d014f17af80f1588b1cd91b
treef8f8d2f7b970cbd1c14b2842930f7c51eaf477e8
parentf3bc838894aae30c02d94265371cd4daf283594a
parentfe29c6ff52f818f98f6b066a38ab6b5f2112dc6c
Merge PR #24064 into master

* refs/pull/24064/head:
osd: simplify init of fabricated pg
osd/PG: inherit pg history from merge source, if necessary
osd/osd_types: increasing pg_num_pending is also an interval change
osd: cancel pg merge if PGs are undersized
mon/OSDMonitor: handle ready_to_merge message that cancels the merge
osd/PG: only signal ready_to_merge if we have all replicas
osd/PG: move all mark_clean-ish activity into try_mark_clean()
osd/PG: use last_epoch_clean from ReadyToMerge point in time for fabricated history
osd: send last_epoch_clean when indicating PG is ready to merge
osd/osd_types: rename pg_num_pending_dec_epoch -> pg_num_dec_last_epoch_clean
osd,mon: stop setting pg_num_pending_dec_epoch

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
src/mon/OSDMonitor.cc
src/osd/OSD.cc
src/osd/OSD.h
src/osd/PG.cc
src/osd/PG.h
src/osd/osd_types.h