From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Thu, 19 Sep 2019 18:20:50 +0000 (-0400)
Subject: Merge pull request #30163 from zhangsw/feature-rgw-opslog-transid
X-Git-Tag: v15.1.0~1495
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=026eed47d25736d5f26e62bf3ca609f8546ccbc2;p=ceph-ci.git

Merge pull request #30163 from zhangsw/feature-rgw-opslog-transid

rgw: add transaction id to ops log.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
---

026eed47d25736d5f26e62bf3ca609f8546ccbc2
diff --cc src/rgw/rgw_log.h
index 2654cf4402b,9c804102020..dc3200f5f51
--- a/src/rgw/rgw_log.h
+++ b/src/rgw/rgw_log.h
@@@ -108,9 -110,12 +110,12 @@@ struct rgw_log_entry 
      if (struct_v >= 9) {
        decode(x_headers, p);
      }
+     if (struct_v >= 10) {
+       decode(trans_id, p);
+     }
      DECODE_FINISH(p);
    }
 -  void dump(Formatter *f) const;
 +  void dump(ceph::Formatter *f) const;
    static void generate_test_instances(list<rgw_log_entry*>& o);
  };
  WRITE_CLASS_ENCODER(rgw_log_entry)