openstack/openstack-helm-infra
Code Issues Proposed changes

Additional Ceph RGW tuning and cleanups

Browse Source 
Set RGW rados handles from 1 to 4
Remove support for fastcgi (it's no longer supported)

Change-Id: Ie260a3e1e5eab2065ec6a4d0637c144965a4214d
This commit is contained in:
Matthew Heler 2018-11-03 16:37:40 -05:00
parent 2640e7422d
commit 225b85eb5f
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ceph-rgw/templates/bin/rgw/_start.sh.tpl
View File

@ -22,9 +22,6 @@ export LC_ALL=C
: "${RGW_NAME:=$(uname -n)}" : "${RGW_NAME:=$(uname -n)}"
: "${RGW_ZONEGROUP:=}" : "${RGW_ZONEGROUP:=}"
: "${RGW_ZONE:=}" : "${RGW_ZONE:=}"
: "${RGW_REMOTE_CGI:=0}"
: "${RGW_REMOTE_CGI_PORT:=9000}"
: "${RGW_REMOTE_CGI_HOST:=0.0.0.0}"
: "${ADMIN_KEYRING:=/etc/ceph/${CLUSTER}.client.admin.keyring}" : "${ADMIN_KEYRING:=/etc/ceph/${CLUSTER}.client.admin.keyring}"
: "${RGW_KEYRING:=/var/lib/ceph/radosgw/${RGW_NAME}/keyring}" : "${RGW_KEYRING:=/var/lib/ceph/radosgw/${RGW_NAME}/keyring}"
: "${RGW_BOOTSTRAP_KEYRING:=/var/lib/ceph/bootstrap-rgw/${CLUSTER}.keyring}" : "${RGW_BOOTSTRAP_KEYRING:=/var/lib/ceph/bootstrap-rgw/${CLUSTER}.keyring}"
@ -57,10 +54,7 @@ if [ ! -e "${RGW_KEYRING}" ]; then
chmod 0600 "${RGW_KEYRING}" chmod 0600 "${RGW_KEYRING}"
fi fi
RGW_FRONTENDS="civetweb port=$RGW_CIVETWEB_PORT" RGW_FRONTENDS="civetweb port=${RGW_CIVETWEB_PORT}"
if [ "$RGW_REMOTE_CGI" -eq 1 ]; then
RGW_FRONTENDS="fastcgi socket_port=$RGW_REMOTE_CGI_PORT socket_host=$RGW_REMOTE_CGI_HOST"
fi
/usr/bin/radosgw \ /usr/bin/radosgw \
--cluster "${CLUSTER}" \ --cluster "${CLUSTER}" \

2
ceph-rgw/values.yaml
View File

@ -283,7 +283,9 @@ conf:
#NOTE (JCL): See http://tracker.ceph.com/issues/24937 #NOTE (JCL): See http://tracker.ceph.com/issues/24937
#NOTE (JCL): See https://tracker.ceph.com/issues/24551 #NOTE (JCL): See https://tracker.ceph.com/issues/24551
rgw_dynamic_resharding: false rgw_dynamic_resharding: false
#NOTE (supamatt): Increase threads and rados handles for better performance
rgw_thread_pool_size: 512 rgw_thread_pool_size: 512
rgw_num_rados_handles: 4
rgw_s3: rgw_s3:
enabled: false enabled: false
admin_caps: "users=*;buckets=*;zone=*" admin_caps: "users=*;buckets=*;zone=*"