]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #21700 from cbodley/wip-rgw-dpp
authorCasey Bodley <cbodley@users.noreply.github.com>
Tue, 22 May 2018 15:21:30 +0000 (11:21 -0400)
committerGitHub <noreply@github.com>
Tue, 22 May 2018 15:21:30 +0000 (11:21 -0400)
rgw: use DoutPrefixProvider to add more context to log output

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
1  2 
src/rgw/rgw_common.cc
src/rgw/rgw_common.h
src/rgw/rgw_file.h
src/rgw/rgw_op.cc
src/rgw/rgw_op.h
src/rgw/rgw_rest_user.cc

Simple merge
Simple merge
Simple merge
index 789999e8695e4ed106a8c023f5e9e64081dca1f5,6a0022f022aa22f5980e1fe4d49c2880a1e5925d..ca56cbf1b88d811d6fdf0361e6c51d9e5266eead
@@@ -590,10 -592,10 +592,10 @@@ void rgw_add_to_iam_environment(rgw::IA
  static int rgw_iam_add_tags_from_bl(struct req_state* s, bufferlist& bl){
    RGWObjTags tagset;
    try {
 -    auto bliter = bl.begin();
 +    auto bliter = bl.cbegin();
      tagset.decode(bliter);
    } catch (buffer::error& err) {
-     ldout(s->cct,0) << "ERROR: caught buffer::error, couldn't decode TagSet" << dendl;
+     ldpp_dout(s, 0) << "ERROR: caught buffer::error, couldn't decode TagSet" << dendl;
      return -EIO;
    }
  
Simple merge
Simple merge