From: Matt Benjamin <mbenjamin@redhat.com>
Date: Wed, 29 Apr 2020 03:10:34 +0000 (-0400)
Subject: rgw: lc:  cls_rgw_lc_list_entries_op struc_v off-by-one
X-Git-Tag: v15.2.5~56^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=35ea446c0f6d0127f9b360c1e917894ae5d3111d;p=ceph.git

rgw: lc:  cls_rgw_lc_list_entries_op struc_v off-by-one

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
---

diff --git a/src/cls/rgw/cls_rgw_ops.h b/src/cls/rgw/cls_rgw_ops.h
index 785c862dd109..a52777b83a76 100644
--- a/src/cls/rgw/cls_rgw_ops.h
+++ b/src/cls/rgw/cls_rgw_ops.h
@@ -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);