]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
osd: make the PG's SORTBITWISE assert a more generous shutdown 18047/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:48:58 +0000 (10:48 -0700)
commit0a691b2b1c19fbc30af5c4046736dacb2fb8bfa4
treeaaee734e6a3fc6b21ed94b739f42c9f9845572c5
parent8152fecd375c9d8af8797a995cd3e0a5f99fa037
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>
src/osd/OSD.cc
src/osd/PG.cc