From 515952d07107d442889754ec3bd6a344fad25d58 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Wed, 8 Aug 2012 15:21:53 -0700 Subject: [PATCH] cls_rgw: fix rgw_cls_usage_log_trim_op encode/decode It was not encoding user, adding that and reset version compatibility. This changes affects command interface, makes use of radosgw-admin usage trim incompatible. Use of old radosgw-admin usage trim should be avoided, as it may remove more data than requested. In any case, upgraded server code will not handle old client's trim requests. backport: argonaut Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_cls_api.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_cls_api.h b/src/rgw/rgw_cls_api.h index f60bfecd4fc97..defd8b98a16f4 100644 --- a/src/rgw/rgw_cls_api.h +++ b/src/rgw/rgw_cls_api.h @@ -497,16 +497,18 @@ struct rgw_cls_usage_log_trim_op { string user; void encode(bufferlist& bl) const { - ENCODE_START(1, 1, bl); + ENCODE_START(2, 2, bl); ::encode(start_epoch, bl); ::encode(end_epoch, bl); + ::encode(user, bl); ENCODE_FINISH(bl); } void decode(bufferlist::iterator& bl) { - DECODE_START(1, bl); + DECODE_START(2, bl); ::decode(start_epoch, bl); ::decode(end_epoch, bl); + ::decode(user, bl); DECODE_FINISH(bl); } }; -- 2.39.5