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

librbd: cannot access non-primary image when mirroring force disabled #11568

Merged
merged 7 commits into from Nov 1, 2016

Conversation

dillaman
Copy link

No description provided.

@dillaman
Copy link
Author

retest this please

@trociny trociny self-assigned this Oct 29, 2016
trociny pushed a commit that referenced this pull request Oct 29, 2016
 librbd: cannot access non-primary image when mirroring force disabled #11568
})}
}, 0);
expect_journal_client_unregister(mock_image_ctx, "peer 1", -EINVAL);
expect_snap_remove(mock_image_ctx, "snap 1", 0);
Copy link
Contributor

Choose a reason for hiding this comment

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

@dillaman Observing this test (also SnapRemoveError, and I suppose some other) fails sporadically (--gtest_repeat=100) due to a race between unregister_client from "peer 1" and snap_remove from "peer 2", as they run concurrently and snap_remove may finish earlier than client_unregister:

2016-10-30 12:46:15.266679 7ff8d07b1980 10 librbd::mirror::DisableRequest: 0x7ff8d926eef0 send_get_mirror_image
2016-10-30 12:46:15.266709 7ff8bd92d700 10 librbd::mirror::DisableRequest: 0x7ff8d926eef0 handle_get_mirror_image: r=0
2016-10-30 12:46:15.266712 7ff8bd92d700 10 librbd::mirror::DisableRequest: 0x7ff8d926eef0 send_get_tag_owner
2016-10-30 12:46:15.266736 7ff8b6ffd700 10 librbd::mirror::DisableRequest: 0x7ff8d926eef0 handle_get_tag_owner: r=0
2016-10-30 12:46:15.266738 7ff8b6ffd700 10 librbd::mirror::DisableRequest: 0x7ff8d926eef0 send_set_mirror_image
2016-10-30 12:46:15.266763 7ff8bd92d700 10 librbd::mirror::DisableRequest: 0x7ff8d926eef0 handle_set_mirror_image: r=0
2016-10-30 12:46:15.266764 7ff8bd92d700 10 librbd::mirror::DisableRequest: 0x7ff8d926eef0 send_notify_mirroring_watcher
2016-10-30 12:46:15.266771 7ff8b6ffd700 10 librbd::mirror::DisableRequest: 0x7ff8d926eef0 handle_notify_mirroring_watcher: r=0
2016-10-30 12:46:15.266773 7ff8b6ffd700 10 librbd::mirror::DisableRequest: 0x7ff8d926eef0 send_get_clients
2016-10-30 12:46:15.266813 7ff8bd92d700 10 librbd::mirror::DisableRequest: 0x7ff8d926eef0 handle_get_clients: r=0
2016-10-30 12:46:15.266817 7ff8bd92d700 10 librbd::mirror::DisableRequest: 0x7ff8d926eef0 send_unregister_client
2016-10-30 12:46:15.266826 7ff8bd92d700 10 librbd::mirror::DisableRequest: 0x7ff8d926eef0 send_remove_snap: client_id=peer 2, snap_name=snap 1
2016-10-30 12:46:15.266832 7ff8bd92d700 10 librbd::mirror::DisableRequest: 0x7ff8d926eef0 send_remove_snap: client_id=peer 2, snap_name=snap 2
2016-10-30 12:46:15.266870 7ff8bd92d700 10 librbd::mirror::DisableRequest: 0x7ff8d926eef0 handle_unregister_client: r=-22
2016-10-30 12:46:15.266873 7ff8bd92d700 -1 librbd::mirror::DisableRequest: failed to unregister remote journal client: (22) Invalid argument

Jason Dillaman added 7 commits October 31, 2016 10:57
Fixes: http://tracker.ceph.com/issues/16740
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
If mirroring is force disabled on a demoted image, the journal was
being left in an inconsistent ownership state.

Fixes: http://tracker.ceph.com/issues/17588
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
This facilitates being able to properly mock test cases around journal
cls method calls.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
@dillaman
Copy link
Author

@trociny update pushed

trociny pushed a commit that referenced this pull request Oct 31, 2016
 librbd: cannot access non-primary image when mirroring force disabled #11568
@trociny
Copy link
Contributor

trociny commented Nov 1, 2016

lgtm

@trociny trociny merged commit 478d666 into ceph:master Nov 1, 2016
@dillaman dillaman deleted the wip-17588 branch November 1, 2016 12:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants