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

rgw: add transaction id to ops log.

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

diff --cc src/rgw/rgw_dencoder.cc
Simple merge

diff --cc src/rgw/rgw_json_enc.cc
Simple merge

diff --cc src/rgw/rgw_log.cc
Simple merge

diff --cc src/rgw/rgw_log.h
index 2654cf4402ba7c66163af74adedddcb7353bb464,9c80410202098a4804c99aaefc3915b92a5a2898..dc3200f5f5160676b2778667b1e66d21ae58ff46
--- 1/src/rgw/rgw_log.h
--- 2/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)