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

rbd-mirror: clean up spurious error log messages #18601

Merged
merged 2 commits into from Oct 29, 2017

Conversation

dillaman
Copy link

No description provided.

dillaman pushed a commit to dillaman/ceph that referenced this pull request Oct 27, 2017
Previously, if only the local image was using the journal or if
a disconnected peer was attached, the tag entries could not be
expired even if unreferenced.

Fixes: ceph#18601
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
dillaman pushed a commit to dillaman/ceph that referenced this pull request Oct 27, 2017
Previously, if only the local image was using the journal or if
a disconnected peer was attached, the tag entries could not be
expired even if unreferenced.

Fixes: ceph#18601
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
<< "m_client_meta.image_id=" << m_client_meta.image_id << ", "
<< "client.state=" << client.state << dendl;
dout(5) << "image_id=" << m_local_image_id << ", "
<< "client_meta.image_id=" << m_client_meta.image_id << ", "

Choose a reason for hiding this comment

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

NIT: tab missed

} else if (r < 0) {
derr << "failed to retrieve client: " << cpp_strerror(r) << dendl;
finish(r);
} else if (!decode_client_meta()) {
// require operator intervention since the data is corrupt
finish(-EBADMSG);
return;
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: return is not needed (just to be consistent with other clauses, or add it to every clause).

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

@trociny update pushed

Copy link
Contributor

@trociny trociny left a comment

Choose a reason for hiding this comment

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

lgtm

@trociny trociny merged commit f212753 into ceph:master Oct 29, 2017
@dillaman dillaman deleted the wip-21961 branch October 29, 2017 11:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants