RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

cls/rgw: update rgw_cls_usage_log_trim_op encode version

Browse Source 
commit 7b17da691f 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>
This commit is contained in:
Casey Bodley 2018-12-18 09:33:27 -05:00
parent c7940db6b6
commit 48ac39cf65
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cls/rgw/cls_rgw_ops.h
View File

@ -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);