]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #1944 from athanatos/wip-8396
authorGregory Farnum <greg@inktank.com>
Wed, 25 Jun 2014 17:02:41 +0000 (10:02 -0700)
committerGregory Farnum <greg@inktank.com>
Wed, 25 Jun 2014 17:02:41 +0000 (10:02 -0700)
commit25466839589813047c975e44e67e14f34e32139e
tree0da88a247d44e3e96cc7a1872e7908b67c40d5ad
parenteb16198ff0754abae1faa4775c523dc405a8ec58
parentecda2fef8ce982df3581a3b47ba74ae581d82479
Merge pull request #1944 from athanatos/wip-8396

Move the waiting_for_pg list down into the Sessions, and coordinate the updates so that we don't get races
between the Pipe and handle_map threads.

Fixes: #8396
Fixes: #8505
Reviewed-by: Greg Farnum <greg@inktank.com>
src/osd/OSD.cc
src/osd/OSD.h
src/osd/PG.cc
src/osd/PG.h