From 44bc63b1665c071dbbedf9b484a422ca9b7cf6b9 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Wed, 3 Dec 2014 11:30:44 -0800 Subject: [PATCH] rgw: decode the req_state bucket instance id if needed Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_op.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 124511026d7..625f081a9a5 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -322,7 +322,14 @@ static int rgw_build_policies(RGWRados *store, struct req_state *s, bool only_bu string obj_str; RGWUserInfo bucket_owner_info; - s->bucket_instance_id = s->info.args.get(RGW_SYS_PARAM_PREFIX "bucket-instance"); + string bi = s->info.args.get(RGW_SYS_PARAM_PREFIX "bucket-instance"); + if (!bi.empty()) { + int shard_id; + ret = rgw_bucket_parse_bucket_instance(bi, &s->bucket_instance_id, &shard_id); + if (ret < 0) { + return ret; + } + } s->bucket_acl = new RGWAccessControlPolicy(s->cct); -- 2.47.3