From 8ba6c2de830129ec0533652a3cb33391b584006d Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 19 Nov 2024 14:02:02 -0500 Subject: [PATCH] rgw: RGWAccessKey::decode_json() preserves default value of 'active' squid added the new "bool active" member that defaults to true, but RGWAccessKey::decode_json() sets it to false when "active" isn't present this is an issue for multisite when a squid zone replicates user metadata from a master zone running reef Fixes: https://tracker.ceph.com/issues/68985 Signed-off-by: Casey Bodley --- src/rgw/rgw_common.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc index 68fb9a2927860..1a59ba02999f5 100644 --- a/src/rgw/rgw_common.cc +++ b/src/rgw/rgw_common.cc @@ -2994,7 +2994,9 @@ void RGWAccessKey::decode_json(JSONObj *obj) { subuser = user.substr(pos + 1); } } - JSONDecoder::decode_json("active", active, obj); + if (bool tmp = false; JSONDecoder::decode_json("active", tmp, obj)) { + active = tmp; // update only if "active" is present + } JSONDecoder::decode_json("create_date", create_date, obj); }