]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: lc: cls_rgw_lc_list_entries_op struc_v off-by-one
authorMatt Benjamin <mbenjamin@redhat.com>
Wed, 29 Apr 2020 03:10:34 +0000 (23:10 -0400)
committerNathan Cutler <ncutler@suse.com>
Sun, 9 Aug 2020 20:49:12 +0000 (22:49 +0200)
The incoming version of -new- clients required to be one
higher to trigger the new result format.

Yes, this means that "radosgw-admin lc list" against an
un-upgraded OSD will display Unix epoch for lc-entry
start_time (harmless, and in general will not happen).

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 4db52b18ae5a1eb62af9761aacf9364ebd72b154)

Conflicts:
src/cls/rgw/cls_rgw_ops.h
- adapt for Adam Emerson post-Octopus refactoring

src/cls/rgw/cls_rgw_ops.h

index 785c862dd109dda995f37880fd3dcd99ca8472ba..a52777b83a7613483cdb2f367d0ed2fd0238fc87 100644 (file)
@@ -1194,14 +1194,14 @@ struct cls_rgw_lc_list_entries_op {
   cls_rgw_lc_list_entries_op() {}
 
   void encode(bufferlist& bl) const {
-    ENCODE_START(2, 1, bl);
+    ENCODE_START(3, 1, bl);
     encode(marker, bl);
     encode(max_entries, bl);
     ENCODE_FINISH(bl);
   }
 
   void decode(bufferlist::const_iterator& bl) {
-    DECODE_START(2, bl);
+    DECODE_START(3, bl);
     compat_v = struct_v;
     decode(marker, bl);
     decode(max_entries, bl);