From 35ea446c0f6d0127f9b360c1e917894ae5d3111d Mon Sep 17 00:00:00 2001 From: Matt Benjamin Date: Tue, 28 Apr 2020 23:10:34 -0400 Subject: [PATCH] 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 (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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cls/rgw/cls_rgw_ops.h b/src/cls/rgw/cls_rgw_ops.h index 785c862dd10..a52777b83a7 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); -- 2.47.3