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: cleanup logging code under librbd/io #14975

Merged
merged 1 commit into from May 10, 2017

Conversation

Projects
None yet
3 participants
@runsisi
Contributor

runsisi commented May 5, 2017

Signed-off-by: runsisi runsisi@zte.com.cn

@dillaman dillaman self-requested a review May 5, 2017

m_pending_requests.push_back(req);
}
void CopyupRequest::complete_requests(int r) {
while (!m_pending_requests.empty()) {
vector<ObjectRequest<> *>::iterator it = m_pending_requests.begin();
ObjectRequest<> *req = *it;
ldout(m_ictx->cct, 20) << __func__ << " completing request " << req
ldout(m_ictx->cct, 20) << "completing request " << req
<< dendl;

This comment has been minimized.

@dillaman

dillaman May 5, 2017

Contributor

Nit: you can move this to the previous line

@@ -168,7 +168,7 @@ bool CopyupRequest::send_copyup() {
// merge all pending write ops into this single RADOS op
for (size_t i=0; i<m_pending_requests.size(); ++i) {
ObjectRequest<> *req = m_pending_requests[i];
ldout(m_ictx->cct, 20) << __func__ << " add_copyup_ops " << req
ldout(m_ictx->cct, 20) << "add_copyup_ops " << req
<< dendl;

This comment has been minimized.

@dillaman

dillaman May 5, 2017

Contributor

Nit: you can move this to the previous line

ldout(m_ictx->cct, 20) << __func__ << " " << this << " copyup with "
<< "empty snapshot context" << dendl;
ldout(m_ictx->cct, 20) << "copyup with empty snapshot context"
<< dendl;

This comment has been minimized.

@dillaman

dillaman May 5, 2017

Contributor

Nit: you can move this to the previous line(?)

<< "safe" << dendl;
aio_comp->add_request();
}
void finish(int r) override {
CephContext *cct = image_ctx.cct;
ldout(cct, 20) << this << " C_FlushJournalCommit: journal committed"
ldout(cct, 20) << "C_FlushJournalCommit: journal committed"
<< dendl;

This comment has been minimized.

@dillaman

dillaman May 5, 2017

Contributor

Nit: you can move this to the previous line(?)

@@ -304,6 +304,9 @@ template <typename I>
void ObjectReadRequest<I>::send_copyup()
{
ImageCtx *image_ctx = this->m_ictx;
ldout(image_ctx->cct, 20) << "send_copyup " << this << " " << this->m_oid << " "

This comment has been minimized.

@dillaman

dillaman May 5, 2017

Contributor

This will now have "send_copyup" and this in the log message twice

librbd: cleanup logging code under librbd/io
Signed-off-by: runsisi <runsisi@zte.com.cn>
@runsisi

This comment has been minimized.

Contributor

runsisi commented May 10, 2017

@dillaman updated, thanks!

@dillaman

lgtm

@dillaman dillaman merged commit fd0fdcf into ceph:master May 10, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details

@runsisi runsisi deleted the runsisi:wip-io-logging branch May 10, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment