]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osd: make the PG's SORTBITWISE assert a more generous shutdown 18132/head
authorGreg Farnum <gfarnum@redhat.com>
Fri, 29 Sep 2017 22:18:26 +0000 (15:18 -0700)
committerGreg Farnum <gfarnum@redhat.com>
Thu, 5 Oct 2017 17:50:59 +0000 (10:50 -0700)
commitf0a6f616c6c0358c2a7b9eb24fd6ca9c4290be0a
tree529c6503255153913676e3dba20bab8435b42472
parent66af04cd9b61d482362361cb3b12af2d8ffa462c
osd: make the PG's SORTBITWISE assert a more generous shutdown

We want to stop working if we get activated while sortbitwise is not set
on the cluster, but we might have old maps where it wasn't if the flag
was changed recently. And doing it in the PG code was a bit silly anyway.

Instead check SORTBITWISE in the main OSDMap handling code prior to
prepublishing it. Let it go through if we aren't active at the time.

Fixes: http://tracker.ceph.com/issues/20416
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 0a691b2b1c19fbc30af5c4046736dacb2fb8bfa4)
src/osd/OSD.cc
src/osd/PG.cc