From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 18 Dec 2018 14:33:27 +0000 (-0500)
Subject: cls/rgw: update rgw_cls_usage_log_trim_op encode version
X-Git-Tag: v14.1.0~585^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=48ac39cf657a9b372d5e7a9eb20c2046e74ed2b5;p=ceph-ci.git

cls/rgw: update rgw_cls_usage_log_trim_op encode version

commit 7b17da691f3bee8118ac69a7419519017030a4c9 added a 'bucket' field
to this op without bumping the encode version, and is causing failures
on upgrade

Fixes: http://tracker.ceph.com/issues/37703

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

diff --git a/src/cls/rgw/cls_rgw_ops.h b/src/cls/rgw/cls_rgw_ops.h
index 04c3ce366b0..826bca4383a 100644
--- a/src/cls/rgw/cls_rgw_ops.h
+++ b/src/cls/rgw/cls_rgw_ops.h
@@ -767,7 +767,7 @@ struct rgw_cls_usage_log_trim_op {
   string bucket;
 
   void encode(bufferlist& bl) const {
-    ENCODE_START(2, 2, bl);
+    ENCODE_START(3, 2, bl);
     encode(start_epoch, bl);
     encode(end_epoch, bl);
     encode(user, bl);
@@ -776,11 +776,11 @@ struct rgw_cls_usage_log_trim_op {
   }
 
   void decode(bufferlist::const_iterator& bl) {
-    DECODE_START(2, bl);
+    DECODE_START(3, bl);
     decode(start_epoch, bl);
     decode(end_epoch, bl);
     decode(user, bl);
-    if (struct_v >= 2) {
+    if (struct_v >= 3) {
       decode(bucket, bl);
     }
     DECODE_FINISH(bl);