]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #52210 from ceph/wip-nitzan-ceph-dencoder-extend-common-types...
authorYuri Weinstein <yweinste@redhat.com>
Wed, 13 Dec 2023 15:40:08 +0000 (07:40 -0800)
committerGitHub <noreply@github.com>
Wed, 13 Dec 2023 15:40:08 +0000 (07:40 -0800)
ceph-dencoder: COMMON - Add missing types

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
1  2 
src/cls/2pc_queue/cls_2pc_queue_ops.h
src/cls/queue/cls_queue_ops.h
src/include/cephfs/types.h
src/messages/MClientRequest.h
src/os/bluestore/bluestore_types.cc
src/os/bluestore/bluestore_types.h

Simple merge
index f41572036c51474cc322616c8ea8782cf3904b32,0b0b30b6f01cdfc26231f4b670107ab72a7b52c9..25bf1200c547c41fea5f1787f6a1c224b0509a28
@@@ -52,9 -77,8 +77,9 @@@ struct cls_queue_enqueue_op 
  WRITE_CLASS_ENCODER(cls_queue_enqueue_op)
  
  struct cls_queue_list_op {
-   uint64_t max;
+   uint64_t max{0};
    std::string start_marker;
 +  std::string end_marker;
  
    cls_queue_list_op() {}
  
    }
  
    void decode(ceph::buffer::list::const_iterator& bl) {
 -    DECODE_START(1, bl);
 +    DECODE_START(2, bl);
      decode(max, bl);
      decode(start_marker, bl);
 +    if (struct_v > 1) {
 +      decode(end_marker, bl);
 +    }
      DECODE_FINISH(bl);
    }
+   void dump(ceph::Formatter *f) const {
+     f->dump_unsigned("max", max);
+     f->dump_string("start_marker", start_marker);
+   }
+   static void generate_test_instances(std::list<cls_queue_list_op*>& o) {
+     o.push_back(new cls_queue_list_op);
+     o.push_back(new cls_queue_list_op);
+     o.back()->max = 123;
+     o.back()->start_marker = "foo";
+   }
  };
  WRITE_CLASS_ENCODER(cls_queue_list_op)
  
Simple merge
Simple merge
Simple merge
Simple merge