]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
PG:: reset_interval_flush and in set_last_peering_reset
authorSamuel Just <sam.just@inktank.com>
Mon, 20 Oct 2014 21:10:58 +0000 (14:10 -0700)
committerSamuel Just <sam.just@inktank.com>
Thu, 30 Oct 2014 20:43:42 +0000 (13:43 -0700)
commit35e8e6b2c1733cd421bf6c3916553eea3786e76e
treee290b3ff9d775ef7c0bc36632ce02a7269212b3e
parent3f35db42977704a12ac4b5bcad6261aaf6b6a88d
PG:: reset_interval_flush and in set_last_peering_reset

If we have a change in the prior set, but not in the up/acting set, we go back
through Reset in order to reset peering state.  Previously, we would reset
last_peering_reset in the Reset constructor.  This did not, however, reset the
flush_interval, which caused the eventual flush event to be ignored and the
peering messages to not be sent.

Instead, we will always reset_interval_flush if we are actually changing the
last_peering_reset value.

Fixes: #9821
Backport: firefly
Signed-off-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit d9ff3a6b789c5b9c77aefa3751bd808f5d7b8ca7)
src/osd/PG.cc