From 914a81dca59bc772c03ca4aa3c23b6f00bba6979 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Mon, 18 Feb 2019 18:15:11 -0500 Subject: [PATCH] rgw: fix rgw_data_sync_info::json_decode() this was trying to decode a 'uint64_t instance_id' into the wrong variable 'uint32_t num_shards' datalog trimming relies on this json format, and decode failures here prevent any trimming from taking place Fixes: http://tracker.ceph.com/issues/38373 Signed-off-by: Casey Bodley (cherry picked from commit 2b51d52bab2bd95834524316d5e71ff362aa0507) --- src/rgw/rgw_data_sync.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_data_sync.h b/src/rgw/rgw_data_sync.h index 57206021154fa..2d24bf63121e4 100644 --- a/src/rgw/rgw_data_sync.h +++ b/src/rgw/rgw_data_sync.h @@ -83,7 +83,7 @@ struct rgw_data_sync_info { state = StateInit; } JSONDecoder::decode_json("num_shards", num_shards, obj); - JSONDecoder::decode_json("instance_id", num_shards, obj); + JSONDecoder::decode_json("instance_id", instance_id, obj); } static void generate_test_instances(std::list& o); -- 2.39.5