]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
osd: do not release_reserved_pushes when requeuing 21229/head
authorSage Weil <sage@redhat.com>
Wed, 4 Apr 2018 02:24:07 +0000 (21:24 -0500)
committerSage Weil <sage@redhat.com>
Wed, 4 Apr 2018 02:24:07 +0000 (21:24 -0500)
commit4cbca81b049a45d1dd7220f9f63b2b6f3c81af66
tree7a58544ac14660df30cfa877831d52bb278498b9
parent8ebcd8d68d691d89659f3fad69afb68c8458aada
osd: do not release_reserved_pushes when requeuing

Back in 3cc48278bf0ee5c9535d04b60a661f988c50063b we refactoring the sharded
wq and incorrectly included code that would release_reserved_pushes for
items that were queued and deferred and then woken and put back in the
queue. The reserved_pushes are for recovery ops that are in flight in the
queue, which includes the priority queue *and* the waiting_for_pg; the code
we replaced would release these only when dequeueing an item (or items) for
processing (or discard).

In master, this code is fixed as part of the peering fast dispatch and
OSDShard refactor.

Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/OSD.cc