Merge pull request #1005 from lxchx/conf-optimize

conf: optimize init attribute
iqiyi · Nov 28, 2024 · 9c87f87 · 9c87f87
2 parents 673aa0c + 63c536f
commit 9c87f87
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 24 deletions.
diff --git a/conf/dpvs.bond.conf.sample b/conf/dpvs.bond.conf.sample
@@ -14,9 +14,9 @@
 global_defs {
     log_level   WARNING
     ! log_file    /var/log/dpvs.log
-    ! log_async_mode    off
-    ! kni               on
-    ! pdump             off
+    ! <init> log_async_mode    off
+    ! <init> kni               on
+    ! <init> pdump             off
     lldp                on
 }
 
@@ -277,7 +277,7 @@ timer_defs {
 ! dpvs neighbor config
 neigh_defs {
     <init> unres_queue_length  128
-    <init> timeout             60
+    timeout             60
 }
 
 ! dpvs ipset config
@@ -323,7 +323,7 @@ ipvs_defs {
         <init> conn_pool_cache      256
         conn_init_timeout           3
         ! expire_quiescent_template
-        ! fast_xmit_close
+        ! <init> fast_xmit_close
         ! <init> redirect           off
     }
 
@@ -379,6 +379,6 @@ ipvs_defs {
 
 ! sa_pool config
 sa_pool {
-    pool_hash_size  16
-    flow_enable     on
+    <init> pool_hash_size  16
+    <init> flow_enable     on
 }
diff --git a/conf/dpvs.conf.items b/conf/dpvs.conf.items
@@ -212,7 +212,6 @@ ipv6_defs {
 ! control plane config
 ctrl_defs {
     lcore_msg {
-        #bucket_number   256
         <init> ring_size                4096    <4096, 256-524288>
         sync_msg_timeout_us             2000    <2000, 1-∞>
         priority_level                  low     <low, low|norm|high|ign>

diff --git a/conf/dpvs.conf.sample b/conf/dpvs.conf.sample
@@ -14,9 +14,9 @@
 global_defs {
     log_level   WARNING
     ! log_file    /var/log/dpvs.log
-    ! log_async_mode    on
-    ! kni               on
-    ! pdump             off
+    ! <init> log_async_mode    on
+    ! <init> kni               on
+    ! <init> pdump             off
     lldp                on
 }
 
@@ -287,7 +287,7 @@ ipvs_defs {
         <init> conn_pool_cache      256
         conn_init_timeout           3
         ! expire_quiescent_template
-        ! fast_xmit_close
+        ! <init> fast_xmit_close
         ! <init> redirect           off
     }
 
@@ -344,6 +344,6 @@ ipvs_defs {
 
 ! sa_pool config
 sa_pool {
-    pool_hash_size  16
-    flow_enable     on
+    <init> pool_hash_size  16
+    <init> flow_enable     on
 }
diff --git a/conf/dpvs.conf.single-bond.sample b/conf/dpvs.conf.single-bond.sample
@@ -14,8 +14,8 @@
 global_defs {
     log_level   WARNING
     ! log_file    /var/log/dpvs.log
-    ! log_async_mode    on
-    ! kni               on
+    ! <init> log_async_mode    on
+    ! <init> kni               on
     lldp                on
 }
 
@@ -228,7 +228,7 @@ ipvs_defs {
         <init> conn_pool_cache      256
         conn_init_timeout           3
         ! expire_quiescent_template
-        ! fast_xmit_close
+        ! <init> fast_xmit_close
         ! <init> redirect           off
     }
 
@@ -285,6 +285,6 @@ ipvs_defs {
 
 ! sa_pool config
 sa_pool {
-    pool_hash_size  16
-    flow_enable     on
+    <init> pool_hash_size  16
+    <init> flow_enable     on
 }
diff --git a/conf/dpvs.conf.single-nic.sample b/conf/dpvs.conf.single-nic.sample
@@ -14,8 +14,8 @@
 global_defs {
     log_level   WARNING
     ! log_file    /var/log/dpvs.log
-    ! log_async_mode    on
-    ! kni               on
+    ! <init> log_async_mode    on
+    ! <init> kni               on
     lldp                on
 }
 
@@ -202,7 +202,7 @@ ipvs_defs {
         <init> conn_pool_cache      256
         conn_init_timeout           3
         ! expire_quiescent_template
-        ! fast_xmit_close
+        ! <init> fast_xmit_close
         ! <init> redirect           off
     }
 
@@ -259,6 +259,6 @@ ipvs_defs {
 
 ! sa_pool config
 sa_pool {
-    pool_hash_size  16
-    flow_enable     on
+    <init> pool_hash_size  16
+    <init> flow_enable     on
 }