starlingx
/
openstack-armada-app
Code Issues Proposed changes

add io_thread_pool for rabbitmq 

Here is the upstream patch link:
https://review.opendev.org/#/c/677425

Change-Id: I71b6d37b5e335ce9045937009fa93d47a49bcd4c
Partial-Bug: 1834796
Signed-off-by: Bin Yang <bin.yang@intel.com>
This commit is contained in:
Bin Yang 2019-08-13 09:09:51 +08:00
parent cc9cf540db
commit 383d00fbd6
2 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack-helm-infra/centos/openstack-helm-infra.spec
View File

@ -22,6 +22,7 @@ Patch04: 0004-Partial-revert-of-31e3469d28858d7b5eb6355e88b6f49fd6.patch
Patch05: 0005-Add-a-configmap-for-ingress-controller-config.patch
Patch06: 0006-Add-TLS-support-for-Gnocchi-public-endpoint.patch
Patch07: 0007-Fix-pod-restarts-on-all-workers-when-worker-added-re.patch
Patch08: 0008-Add-io_thread_pool-for-rabbitmq.patch
BuildRequires: helm
@ -37,6 +38,7 @@ Openstack Helm Infra charts
%patch05 -p1
%patch06 -p1
%patch07 -p1
%patch08 -p1
%build
# initialize helm and build the toolkit

55
openstack-helm-infra/files/0008-Add-io_thread_pool-for-rabbitmq.patch Normal file
View File

@ -0,0 +1,55 @@
From f4c56def0797f093f626720871bd5e525227685e Mon Sep 17 00:00:00 2001
From: Bin Yang <bin.yang@intel.com>
Date: Tue, 13 Aug 2019 10:15:14 +0800
Subject: [PATCH] add io_thread_pool for rabbitmq
Signed-off-by: Bin Yang <bin.yang@intel.com>
---
rabbitmq/templates/statefulset.yaml | 8 ++++++++
rabbitmq/values.yaml | 4 ++++
2 files changed, 12 insertions(+)
diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml
index 1016f7f..afe5520 100644
--- a/rabbitmq/templates/statefulset.yaml
+++ b/rabbitmq/templates/statefulset.yaml
@@ -111,6 +111,10 @@ spec:
key: RABBITMQ_ADMIN_PASSWORD
- name: RABBITMQ_DEFINITION_FILE
value: "{{ index $envAll.Values.conf.rabbitmq "management.load_definitions" }}"
+{{- if $envAll.Values.io_thread_pool.enabled }}
+ - name: RABBITMQ_IO_THREAD_POOL_SIZE
+ value: {{ $envAll.Values.io_thread_pool.size | quote }}
+{{- end }}
volumeMounts:
- name: rabbitmq-data
mountPath: /var/lib/rabbitmq
@@ -190,6 +194,10 @@ spec:
value: "{{ tuple "oslo_messaging" "internal" "amqp" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}"
- name: PORT_CLUSTERING
value: "{{ add (tuple "oslo_messaging" "internal" "amqp" . | include "helm-toolkit.endpoints.endpoint_port_lookup") 20000 }}"
+{{- if $envAll.Values.io_thread_pool.enabled }}
+ - name: RABBITMQ_IO_THREAD_POOL_SIZE
+ value: {{ $envAll.Values.io_thread_pool.size | quote }}
+{{- end }}
readinessProbe:
initialDelaySeconds: 10
timeoutSeconds: 10
diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml
index bdc730a..367058e 100644
--- a/rabbitmq/values.yaml
+++ b/rabbitmq/values.yaml
@@ -290,6 +290,10 @@ volume:
class_name: general
size: 256Mi
+io_thread_pool:
+ enabled: false
+ size: 64
+
manifests:
configmap_bin: true
configmap_etc: true
--
2.7.4