From 9a5425d5de16045b57c1307cb3b8263c739909b1 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 5 Apr 2017 14:20:20 -0400 Subject: [PATCH] rgw: allow larger payload for period commit testing with 3 zonegroups and 3 zones each, the period json grew larger than 4k and caused decode failures on period commit updated to use the new config variable rgw_max_put_param_size Fixes: http://tracker.ceph.com/issues/19505 Signed-off-by: Casey Bodley (cherry picked from commit 7f2871fe59d933b03f37fde40f1781b2320d0d50) Conflicts: src/rgw/rgw_rest_realm.cc - in RGWOp_Period_Post::execute(), set max_size explicitly instead of backporting rgw_max_put_param_size --- src/rgw/rgw_rest_realm.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_rest_realm.cc b/src/rgw/rgw_rest_realm.cc index 008ab10d633b..fb1ba2f10e73 100644 --- a/src/rgw/rgw_rest_realm.cc +++ b/src/rgw/rgw_rest_realm.cc @@ -84,9 +84,9 @@ void RGWOp_Period_Post::execute() period.init(cct, store, false); // decode the period from input -#define PERIOD_MAX_LEN 4096 + const uint64_t max_size = 1 * 1024 * 1024; bool empty; - http_ret = rgw_rest_get_json_input(cct, s, period, PERIOD_MAX_LEN, &empty); + http_ret = rgw_rest_get_json_input(cct, s, period, max_size, &empty); if (http_ret < 0) { lderr(cct) << "failed to decode period" << dendl; return; -- 2.47.3