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

TSG-21715 update Clixon to 1.2.41

Browse Source
This commit is contained in:
wangmenglan
2024-07-05 11:56:51 +08:00
committed by 付明卫
parent 623b32f727
commit aa78400889
3 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/install_config/group_vars/rpm_version.yml
View File

@@ -91,7 +91,7 @@ hasp_tools_rpm_version:
tsg_os_clixon_rpm_version:
cligen: cligen-5.8.0-release
clixon: clixon-5.8.3-89803bb
tsg-os-mgnt-srv: tsg-os-mgnt-srv-1.2.40.56ffe6b
tsg-os-mgnt-srv: tsg-os-mgnt-srv-1.2.41.5b3e8d1
sce_rpm_version:
sce: sce-1.3.2.a0f1eca

8
ansible/roles/tsg-os-HAL/files/script/build_clixon_default_db.sh
View File

@@ -9,6 +9,14 @@ build_default_db()
<packet_io_engine_cores>${IOCORE}</packet_io_engine_cores>
<workload_cores>${WORKLOAD_CORE}</workload_cores>
</resources>
<packet_io_engine>
<pktmbuf_max_size>${MRZCPD_SZ_DATA}</pktmbuf_max_size>
<pktmbuf_queue_size>${MRZCPD_SZ_TUNNEL}</pktmbuf_queue_size>
<pktmbuf_pool_create_mode>${MRZCPD_CREATE_MODE}</pktmbuf_pool_create_mode>
<pktmbuf_pool_max_elements_count>${MRZCPD_DIRECT_PKTMBUF}</pktmbuf_pool_max_elements_count>
<enable_check_pktmbuf_leak>${MRZCPD_CHECK_BUFFER_LEAK}</enable_check_pktmbuf_leak>
<enable_poll_wait_throttle>${MRZCPD_POLL_WAIT_THROTTLE}</enable_poll_wait_throttle>
</packet_io_engine>
</system>
</config>"
echo ${resources} | xmlstarlet fo > ${tsg_clixon_default_db_file}

14
ansible/roles/tsg-os-HAL/files/script/tsg-os-HAL.sh
View File

@@ -5,7 +5,6 @@ set -x
tsg_os_HAL_cfg_file="/etc/sysconfig/tsg-os-HAL.conf"
tsg_clixon_cfg_file="/opt/tsg/clixon/etc/mgnt-srv.conf"
mrzcpd_conf_file="/var/run/share/container_mrzcpd.conf"
cpu_partitioning_conf_file='/etc/tuned/cpu-partitioning-variables.conf'
tsg_clixon_default_db_file='/etc/clixon/default_db'
@@ -81,17 +80,6 @@ set_clixon_configuration()
[ -f ${tsg_clixon_cfg_file} ] && sed -i "s/^nf_count=.*$/nf_count=${NF_COUNT}/g" ${tsg_clixon_cfg_file}
}
set_mrzcpd_configuration()
{
echo "sz_indirect_pktmbuf=${MRZCPD_INDIRECT_PKTMBUF}" > ${mrzcpd_conf_file}
echo "sz_direct_pktmbuf=${MRZCPD_DIRECT_PKTMBUF}" >> ${mrzcpd_conf_file}
echo "poll_wait_throttle=${MRZCPD_POLL_WAIT_THROTTLE}" >> ${mrzcpd_conf_file}
echo "sz_data=${MRZCPD_SZ_DATA}" >> ${mrzcpd_conf_file}
echo "sz_tunnel=${MRZCPD_SZ_TUNNEL}" >> ${mrzcpd_conf_file}
echo "check_buffer_leak=${MRZCPD_CHECK_BUFFER_LEAK}" >> ${mrzcpd_conf_file}
echo "create_mode=${MRZCPD_CREATE_MODE}" >> ${mrzcpd_conf_file}
}
calculate_hugepages()
{
if [ ! -n "$HUGEPAGES" ]; then
@@ -290,9 +278,7 @@ calculate_mrzcpd_indirect_pktmbuf
calculate_mrzcpd_sz_tunnel
calculate_mrzcpd_direct_pktmbuf
set_k3s_configuration ${mem_num}
set_clixon_configuration
set_mrzcpd_configuration
# add sn to k8s node annotations.
read_device_type