Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests: flush op work queue prior to destroying MockImageCtx #7002

Merged
merged 1 commit into from Dec 21, 2015

Conversation

dillaman
Copy link

Fixes: #14092
Signed-off-by: Jason Dillaman dillaman@redhat.com

Fixes: ceph#14092
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
@@ -56,6 +57,7 @@ struct MockImageCtx {

~MockImageCtx() {
wait_for_async_requests();
image_ctx->op_work_queue->drain();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need to drain aio_work_queue here too, to match ~ImageCtx()?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not currently needed for the mock tests -- they have an explicit redirector that punts calls to MockImageCtx::op_work_queue::queue to ImageCtx::op_work_queue::queue. See expect_op_work_queue.

jdurgin added a commit that referenced this pull request Dec 21, 2015
tests: flush op work queue prior to destroying MockImageCtx

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
@jdurgin jdurgin merged commit df9ff25 into ceph:jewel Dec 21, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants