gfwleak/tsg-tsg-os-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新Clixon，支持配置Packet IO affinity

Browse Source
This commit is contained in:
wangmenglan
2023-06-12 15:07:05 +08:00
committed by 付明卫
parent 9141400172
commit 034c064e83
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/traffic-engine/files/helm/conf/tfe.conf
View File

@@ -215,8 +215,8 @@ app_name="proxy_rule_hits"
# for enable kni v4
[packet_io]
packet_io_threads={{- include "traffic-engine.sapp.workerthread" . }}
packet_io_cpu_affinity_mask={{- include "traffic-engine.sapp.cpu-affinity" . }}
packet_io_threads={{- include "traffic-engine.pktio.workerthread" . }}
packet_io_cpu_affinity_mask={{- include "traffic-engine.pktio.cpu-affinity" . }}
firewall_sids={{ .Values.sid.firewall }}
proxy_sids={{ .Values.sid.proxy }}

8
ansible/roles/traffic-engine/files/helm/templates/_config.tpl
View File

@@ -50,6 +50,10 @@ enable_breakpad_upload=0
{{- len .Values.shaping_affinity }}
{{- end -}}
{{- define "traffic-engine.pktio.workerthread" -}}
{{- len .Values.pktio_affinity }}
{{- end -}}
{{- define "traffic-engine.tfe.cpu-affinity" -}}
{{- if eq (len .Values.tfe_affinity) 1 }}
{{- print (index .Values.tfe_affinity 0) "," (index .Values.tfe_affinity 0) }}
@@ -66,6 +70,10 @@ enable_breakpad_upload=0
{{- join "," .Values.shaping_affinity }}
{{- end -}}
{{- define "traffic-engine.pktio.cpu-affinity" -}}
{{- join "," .Values.pktio_affinity }}
{{- end -}}
{{- define "traffic-engine.device-tag-list" -}}
{{- $tags_list := list -}}
{{- if .Values.device.tags }}

1
ansible/roles/traffic-engine/files/helm/values.yaml
View File

@@ -127,6 +127,7 @@ sapp_affinity: [5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,
tfe_affinity: [77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92]
sce_affinity: [92]
shaping_affinity: [93]
pktio_affinity: [94]
tfe_rps_mask: "00000000"