From 5fab05666e81411661c3b6f1f82524c2a3e0d1dd Mon Sep 17 00:00:00 2001 From: Bjoern Teipel Date: Wed, 12 Oct 2016 18:05:16 -0500 Subject: [PATCH] Add remote procedure call tunables to cinder This allows us to override the default settings, which is useful for large deployments or deploying a large number of cinder volumes at once where backend response times are slowed down. Change-Id: Ibd69473c8d66decea17daad5ce9a5f9e499d7779 Closes-Bug: #1617040 --- defaults/main.yml | 2 ++ releasenotes/notes/add-rpc-tunables-cfb2027b083ccf88.yaml | 6 ++++++ templates/cinder.conf.j2 | 3 +++ 3 files changed, 11 insertions(+) create mode 100644 releasenotes/notes/add-rpc-tunables-cfb2027b083ccf88.yaml diff --git a/defaults/main.yml b/defaults/main.yml index 70f3b9ff..0c25a377 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -158,6 +158,8 @@ cinder_iscsi_port: 3260 ## Cinder RPC cinder_rpc_backend: rabbit +cinder_rpc_executor_thread_pool_size: 64 +cinder_rpc_response_timeout: 60 # (StrOpt) Method used to wipe old volumes (valid options are: none, zero, # shred) diff --git a/releasenotes/notes/add-rpc-tunables-cfb2027b083ccf88.yaml b/releasenotes/notes/add-rpc-tunables-cfb2027b083ccf88.yaml new file mode 100644 index 00000000..fbc199e4 --- /dev/null +++ b/releasenotes/notes/add-rpc-tunables-cfb2027b083ccf88.yaml @@ -0,0 +1,6 @@ +--- +features: + - Deployers can now define the override ``cinder_rpc_executor_thread_pool_size`` + which defaults to 64 + - Deployers can now define the override ``cinder_rpc_response_timeout`` + which defaults to 60 diff --git a/templates/cinder.conf.j2 b/templates/cinder.conf.j2 index 1b0319ea..17c4492d 100644 --- a/templates/cinder.conf.j2 +++ b/templates/cinder.conf.j2 @@ -49,6 +49,9 @@ backup_ceph_pool = {{ cinder_service_backup_ceph_pool }} ## RabbitMQ RPC rpc_backend = {{ cinder_rpc_backend }} +executor_thread_pool_size = {{ cinder_rpc_executor_thread_pool_size }} +rpc_response_timeout = {{ cinder_rpc_response_timeout }} + transport_url = rabbit://{% for host in cinder_rabbitmq_servers.split(',') %}{{ cinder_rabbitmq_userid }}:{{ cinder_rabbitmq_password }}@{{ host }}:{{ cinder_rabbitmq_port }}{% if not loop.last %},{% else %}/{{ cinder_rabbitmq_vhost }}{% endif %}{% endfor %} ## Quota