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

journal: disconnect watch after watch error #7113

Merged
merged 1 commit into from
Jan 5, 2016

Conversation

dillaman
Copy link

@dillaman dillaman commented Jan 5, 2016

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

Fixes: ceph#14168
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
// release old watch on error
if (m_watch_handle != 0) {
m_ioctx.unwatch2(m_watch_handle);
m_watch_handle = 0;
Copy link
Member

Choose a reason for hiding this comment

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

nullptr instead of 0?

Copy link
Author

Choose a reason for hiding this comment

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

m_watch_handle is a uint64_t, not a pointer.

Copy link
Member

Choose a reason for hiding this comment

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

code review by phone, sorry for the noise

jdurgin added a commit that referenced this pull request Jan 5, 2016
journal: disconnect watch after watch error

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
@jdurgin jdurgin merged commit 370718a into ceph:jewel Jan 5, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants