]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #16161 from smithfarm/wip-19614-kraken
authorNathan Cutler <presnypreklad@gmail.com>
Wed, 19 Jul 2017 13:25:48 +0000 (15:25 +0200)
committerGitHub <noreply@github.com>
Wed, 19 Jul 2017 13:25:48 +0000 (15:25 +0200)
kraken: multisite: rest api fails to decode large period on 'period commit'

Reviewed-by: Casey Bodley <cbodley@redhat.com>
1  2 
src/common/config_opts.h
src/rgw/rgw_admin.cc
src/rgw/rgw_op.cc
src/rgw/rgw_op.h
src/rgw/rgw_rados.h
src/rgw/rgw_rest.cc
src/rgw/rgw_rest_s3.cc

index aacd183a161d72ec20d37a2e5b6a112a51fbf468,d4e5c305c6c01777b1b2a080932f074b72eab3c7..8927a6473a52ca2ab7cf87e41f65eabf60e514d3
@@@ -1357,10 -1357,9 +1357,11 @@@ OPTION(rbd_mirror_image_state_check_int
  OPTION(nss_db_path, OPT_STR, "") // path to nss db
  
  
 -OPTION(rgw_max_chunk_size, OPT_INT, 512 * 1024)
 +OPTION(rgw_max_chunk_size, OPT_INT, 4 * 1024 * 1024)
 +OPTION(rgw_put_obj_min_window_size, OPT_INT, 16 * 1024 * 1024)
 +OPTION(rgw_put_obj_max_window_size, OPT_INT, 64 * 1024 * 1024)
  OPTION(rgw_max_put_size, OPT_U64, 5ULL*1024*1024*1024)
+ OPTION(rgw_max_put_param_size, OPT_U64, 1 * 1024 * 1024) // max input size for PUT requests accepting json/xml params
  
  /**
   * override max bucket index shards in zone configuration (if not zero)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge