From 225b85eb5f8a3189eae92fd1c25beba47fcf5226 Mon Sep 17 00:00:00 2001 From: Matthew Heler Date: Sat, 3 Nov 2018 16:37:40 -0500 Subject: [PATCH] Additional Ceph RGW tuning and cleanups Set RGW rados handles from 1 to 4 Remove support for fastcgi (it's no longer supported) Change-Id: Ie260a3e1e5eab2065ec6a4d0637c144965a4214d --- ceph-rgw/templates/bin/rgw/_start.sh.tpl | 8 +------- ceph-rgw/values.yaml | 2 ++ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ceph-rgw/templates/bin/rgw/_start.sh.tpl b/ceph-rgw/templates/bin/rgw/_start.sh.tpl index 6e119eef5..4f391428a 100644 --- a/ceph-rgw/templates/bin/rgw/_start.sh.tpl +++ b/ceph-rgw/templates/bin/rgw/_start.sh.tpl @@ -22,9 +22,6 @@ export LC_ALL=C : "${RGW_NAME:=$(uname -n)}" : "${RGW_ZONEGROUP:=}" : "${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}" : "${RGW_KEYRING:=/var/lib/ceph/radosgw/${RGW_NAME}/keyring}" : "${RGW_BOOTSTRAP_KEYRING:=/var/lib/ceph/bootstrap-rgw/${CLUSTER}.keyring}" @@ -57,10 +54,7 @@ if [ ! -e "${RGW_KEYRING}" ]; then chmod 0600 "${RGW_KEYRING}" fi -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 +RGW_FRONTENDS="civetweb port=${RGW_CIVETWEB_PORT}" /usr/bin/radosgw \ --cluster "${CLUSTER}" \ diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml index 020cca141..e42e71f36 100644 --- a/ceph-rgw/values.yaml +++ b/ceph-rgw/values.yaml @@ -283,7 +283,9 @@ conf: #NOTE (JCL): See http://tracker.ceph.com/issues/24937 #NOTE (JCL): See https://tracker.ceph.com/issues/24551 rgw_dynamic_resharding: false + #NOTE (supamatt): Increase threads and rados handles for better performance rgw_thread_pool_size: 512 + rgw_num_rados_handles: 4 rgw_s3: enabled: false admin_caps: "users=*;buckets=*;zone=*"