From d545728dd0250af15acaba10c9ab63cae0129b0e Mon Sep 17 00:00:00 2001 From: wangmenglan Date: Wed, 3 Apr 2024 15:34:30 +0800 Subject: [PATCH] =?UTF-8?q?update=20clixon=20to=201.2.24=20TSG-20326=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=9E=E6=B5=81=E7=BD=91=E5=8D=A1MTU=20TSG?= =?UTF-8?q?-20308=20Clixon=E4=B8=BA=E7=BB=9F=E8=AE=A1=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E7=9A=84=E6=8F=92=E4=BB=B6=E6=8F=90=E4=BE=9B=E5=BC=80=E5=85=B3?= =?UTF-8?q?=20TSG-20228=20Clixon=E5=A2=9E=E5=8A=A0=E5=AF=B9Dos=20Protector?= =?UTF-8?q?=E7=9A=84=E6=8E=A7=E5=88=B6=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/install_config/group_vars/rpm_version.yml | 2 +- ansible/roles/patches-9000-NPB/files/install.sh | 6 ++++++ ansible/roles/tsg-os-HAL/files/conf/tsg-os-HAL.conf | 1 + ansible/roles/tsg-os-HAL/files/script/tsg-os-HAL.sh | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index c0304f43..cb5188de 100644 --- a/ansible/install_config/group_vars/rpm_version.yml +++ b/ansible/install_config/group_vars/rpm_version.yml @@ -89,7 +89,7 @@ hasp_tools_rpm_version: tsg_os_clixon_rpm_version: cligen: cligen-5.8.0-release clixon: clixon-5.8.0-release - tsg-os-mgnt-srv: tsg-os-mgnt-srv-1.2.22.73b5f31 + tsg-os-mgnt-srv: tsg-os-mgnt-srv-1.2.24.0663da0 sce_rpm_version: sce: sce-1.2.13.b0cd1a0 diff --git a/ansible/roles/patches-9000-NPB/files/install.sh b/ansible/roles/patches-9000-NPB/files/install.sh index 1e68f65b..f7c17f83 100644 --- a/ansible/roles/patches-9000-NPB/files/install.sh +++ b/ansible/roles/patches-9000-NPB/files/install.sh @@ -57,6 +57,12 @@ function set_HAL_config() sed -i '/WORKLOAD_CORE=/c\WORKLOAD_CORE=5-55' $HAL_config # deafault memory hugepages number. sed -i '/HUGEPAGES=/c\HUGEPAGES=16' $HAL_config + # sz_direct_pktmbuf=1048575 + sed -i '/MRZCPD_DIRECT_PKTMBUF=/c\MRZCPD_DIRECT_PKTMBUF=1048575' $HAL_config + # sz_data=12800 + sed -i '/MRZCPD_SZ_DATA=/c\MRZCPD_SZ_DATA=12800' $HAL_config + # create_mode=3 + sed -i '/MRZCPD_CREATE_MODE=/c\MRZCPD_CREATE_MODE=3' $HAL_config } function clean_unarchive_dir() diff --git a/ansible/roles/tsg-os-HAL/files/conf/tsg-os-HAL.conf b/ansible/roles/tsg-os-HAL/files/conf/tsg-os-HAL.conf index ae11ff5f..aab24ca2 100644 --- a/ansible/roles/tsg-os-HAL/files/conf/tsg-os-HAL.conf +++ b/ansible/roles/tsg-os-HAL/files/conf/tsg-os-HAL.conf @@ -15,5 +15,6 @@ # MRZCPD_SZ_DATA= # MRZCPD_SZ_TUNNEL= # MRZCPD_CHECK_BUFFER_LEAK= +# MRZCPD_CREATE_MODE= # NIC_CPU_Affinity_Switch= \ No newline at end of file diff --git a/ansible/roles/tsg-os-HAL/files/script/tsg-os-HAL.sh b/ansible/roles/tsg-os-HAL/files/script/tsg-os-HAL.sh index 5a2b9d51..3a5d6009 100644 --- a/ansible/roles/tsg-os-HAL/files/script/tsg-os-HAL.sh +++ b/ansible/roles/tsg-os-HAL/files/script/tsg-os-HAL.sh @@ -25,6 +25,7 @@ MRZCPD_POLL_WAIT_THROTTLE=512 MRZCPD_SZ_DATA=4096 MRZCPD_SZ_TUNNEL= MRZCPD_CHECK_BUFFER_LEAK=1 +MRZCPD_CREATE_MODE=1 TRAFFIC_ENGINE_LOGS_VDISK_PATH="/data/vdisks" TRAFFIC_ENGINE_LOGS_VDISK_SIZE_BYTES= NF_COUNT=16 @@ -124,6 +125,7 @@ set_mrzcpd_conf() 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} } set_hugepages()