]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
osd: fix agent thread shutdown 1395/head
authorSage Weil <sage@inktank.com>
Fri, 7 Mar 2014 00:12:30 +0000 (16:12 -0800)
committerSage Weil <sage@inktank.com>
Fri, 7 Mar 2014 00:12:30 +0000 (16:12 -0800)
commit09668a49584d0738a50f6536910a6be198cfb14d
treeaf2ce6397d2380b6a3a09524fba2d213f5d4dcf6
parent6f7c8c79f55276ef16fa76d2a8520f4f811cab18
osd: fix agent thread shutdown

We had an old invariant that agent_queue would have at least 1 entry in
it to simplify some other code paths, but it turns out that it is simpler
not to do that.

In particular, this was triggering a failed assertion on shutdown when we
assert that the queue is empty.

Dump offending items on shutdown if they are there, tho, to catch any
future bugs.

Fixes: #7637
Signed-off-by: Sage Weil <sage@inktank.com>
src/osd/OSD.cc
src/osd/OSD.h