Merge branch 'sonic-net:master' into sonic_vpp_trixie

dypet · web-flow · commit eecf1d4aba75 · 2026-04-29T13:20:15.000-06:00
diff --git a/ThirdPartyLicenses.txt b/ThirdPartyLicenses.txt
@@ -978,7 +978,6 @@ Microsoft is offering you a license to use the following components, to the exte
  */
 
 4. apt-clean, apt-gzip-indexes, apt-no-languages imported from docker v1.11.1
-5. gnoic imported from https://github.com/karimra/gnoic using Apache License 2.0
 /*
  *                                 Apache License
  *                           Version 2.0, January 2004
diff --git a/device/arista/x86_64-arista_7280cr3_32d4/Arista-7280CR3-C32D4/jr2-a7280cr3-32d4-32x100G+4x400G.config.bcm b/device/arista/x86_64-arista_7280cr3_32d4/Arista-7280CR3-C32D4/jr2-a7280cr3-32d4-32x100G+4x400G.config.bcm
@@ -751,3 +751,4 @@ dma_desc_aggregator_buff_size_kb.BCM8869X=100
 dma_desc_aggregator_timeout_usec.BCM8869X=1000
 dma_desc_aggregator_enable_specific_MDB_LPM.BCM8869X=1
 dma_desc_aggregator_enable_specific_MDB_FEC.BCM8869X=1
+sai_ecmp_group_members_increment=8
diff --git a/device/arista/x86_64-arista_7280cr3_32d4/Arista-7280CR3-C40/jr2-a7280cr3-32d4-40x100G.config.bcm b/device/arista/x86_64-arista_7280cr3_32d4/Arista-7280CR3-C40/jr2-a7280cr3-32d4-40x100G.config.bcm
@@ -768,3 +768,4 @@ dma_desc_aggregator_buff_size_kb.BCM8869X=100
 dma_desc_aggregator_timeout_usec.BCM8869X=1000
 dma_desc_aggregator_enable_specific_MDB_LPM.BCM8869X=1
 dma_desc_aggregator_enable_specific_MDB_FEC.BCM8869X=1
+sai_ecmp_group_members_increment=8
diff --git a/device/arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C28S8/jr2-a7280cr3-32p4-28x100G-8x10G.config.bcm b/device/arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C28S8/jr2-a7280cr3-32p4-28x100G-8x10G.config.bcm
@@ -739,3 +739,4 @@ dma_desc_aggregator_buff_size_kb.BCM8869X=100
 dma_desc_aggregator_timeout_usec.BCM8869X=1000
 dma_desc_aggregator_enable_specific_MDB_LPM.BCM8869X=1
 dma_desc_aggregator_enable_specific_MDB_FEC.BCM8869X=1
+sai_ecmp_group_members_increment=8
diff --git a/device/arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C32P4/jr2-a7280cr3-32p4-32x100G+4x400G.config.bcm b/device/arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C32P4/jr2-a7280cr3-32p4-32x100G+4x400G.config.bcm
@@ -741,3 +741,4 @@ dma_desc_aggregator_buff_size_kb.BCM8869X=100
 dma_desc_aggregator_timeout_usec.BCM8869X=1000
 dma_desc_aggregator_enable_specific_MDB_LPM.BCM8869X=1
 dma_desc_aggregator_enable_specific_MDB_FEC.BCM8869X=1
+sai_ecmp_group_members_increment=8
diff --git a/device/arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C40/jr2-a7280cr3-32p4-40x100G.config.bcm b/device/arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C40/jr2-a7280cr3-32p4-40x100G.config.bcm
@@ -759,3 +759,4 @@ dma_desc_aggregator_buff_size_kb.BCM8869X=100
 dma_desc_aggregator_timeout_usec.BCM8869X=1000
 dma_desc_aggregator_enable_specific_MDB_LPM.BCM8869X=1
 dma_desc_aggregator_enable_specific_MDB_FEC.BCM8869X=1
+sai_ecmp_group_members_increment=8
diff --git a/device/arista/x86_64-arista_7280dr3a_36/Arista-7280DR3A-36/0/jr2p-a7280dra3-36-36x400G.config.bcm b/device/arista/x86_64-arista_7280dr3a_36/Arista-7280DR3A-36/0/jr2p-a7280dra3-36-36x400G.config.bcm
@@ -986,3 +986,4 @@ sai_pfc_dlr_init_capability=0
 sai_default_cpu_tx_tc=7
 sai_disable_srcmacqedstmac_ctrl=1
 sai_lag_default_crc_hash=1
+sai_ecmp_group_members_increment=8
diff --git a/device/arista/x86_64-arista_7280dr3a_36/Arista-7280DR3A-36/1/jr2p-a7280dra3-36-36x400G.config.bcm b/device/arista/x86_64-arista_7280dr3a_36/Arista-7280DR3A-36/1/jr2p-a7280dra3-36-36x400G.config.bcm
@@ -985,3 +985,4 @@ sai_pfc_dlr_init_capability=0
 sai_default_cpu_tx_tc=7
 sai_disable_srcmacqedstmac_ctrl=1
 sai_lag_default_crc_hash=1
+sai_ecmp_group_members_increment=8
diff --git a/device/arista/x86_64-arista_7280r4_32qf_32df/Arista-7280R4-32QF-32DF-64O/buffers_defaults_t2.j2 b/device/arista/x86_64-arista_7280r4_32qf_32df/Arista-7280R4-32QF-32DF-64O/buffers_defaults_t2.j2
@@ -29,10 +29,10 @@
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "12884901888",
+            "size": "25766440000",
             "type": "both",
             "mode": "dynamic",
-            "xoff": "3225378816"
+            "xoff": "2863254732"
         }
     },
     "BUFFER_PROFILE": {
diff --git a/device/arista/x86_64-arista_7280r4_32qf_32df/Arista-7280R4-32QF-32DF-64O/pg_profile_lookup.ini b/device/arista/x86_64-arista_7280r4_32qf_32df/Arista-7280R4-32QF-32DF-64O/pg_profile_lookup.ini
@@ -1,17 +1,17 @@
 # PG lossless profiles.
 # speed   cable     size xon   xoff       threshold xon_offset
-  40000   30m       0    2560  45056      -6        181753
-  100000  30m       0    2560  57344      -6        363506
-  400000  30m       0    2560  131072     -5        1454025
-  800000  30m       0    2560  233472     -4        2908050
-  40000   300m      0    2560  61440      -6        181753
-  100000  300m      0    2560  102400     -6        363506
-  400000  300m      0    2560  311296     -5        1454025
-  800000  300m      0    2560  589824     -4        2908050
-  40000   1000m     0    2560  110592     -6        181753
-  100000  1000m     0    2560  221184     -6        363506
-  400000  1000m     0    2560  778240     -5        1454025
-  800000  1000m     0    2560  1519616    -4        2908050
+  40000   30m       0    2560  176128     -6        181753
+  100000  30m       0    2560  385024     -6        363506
+  400000  30m       0    2560  1441792    -5        1454025
+  800000  30m       0    2560  2850816    -4        2908050
+  40000   300m      0    2560  176128     -6        181753
+  100000  300m      0    2560  385024     -6        363506
+  400000  300m      0    2560  1441792    -5        1454025
+  800000  300m      0    2560  2850816    -4        2908050
+  40000   1000m     0    2560  176128     -6        181753
+  100000  1000m     0    2560  385024     -6        363506
+  400000  1000m     0    2560  1441792    -5        1454025
+  800000  1000m     0    2560  2850816    -4        2908050
   40000   2000m     0    2560  176128     -6        181753
   100000  2000m     0    2560  385024     -6        363506
   400000  2000m     0    2560  1441792    -5        1454025
diff --git a/device/arista/x86_64-arista_7280r4_32qf_32df/Arista-7280R4-32QF-32DF-64O/q3d-a7280R4-32QFx400G-32DFx400G.config.bcm b/device/arista/x86_64-arista_7280r4_32qf_32df/Arista-7280R4-32QF-32DF-64O/q3d-a7280R4-32QFx400G-32DFx400G.config.bcm
@@ -1272,3 +1272,4 @@ sai_default_cpu_tx_tc=7
 sai_disable_srcmacqedstmac_ctrl=1
 appl_param_active_links_thr_high=91
 appl_param_active_links_thr_low=1
+sai_ecmp_group_members_increment=8
diff --git a/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm b/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm
@@ -866,3 +866,4 @@ sai_disable_srcmacqedstmac_ctrl=1
 appl_param_active_links_thr_high=58
 appl_param_active_links_thr_low=1
 custom_feature_start_tx_threshold=20
+sai_ecmp_group_members_increment=8
diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -1020,3 +1020,4 @@ sai_disable_srcmacqedstmac_ctrl=1
 appl_param_active_links_thr_high=91
 appl_param_active_links_thr_low=1
 custom_feature_start_tx_threshold=20
+sai_ecmp_group_members_increment=8
diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -1020,3 +1020,4 @@ sai_disable_srcmacqedstmac_ctrl=1
 appl_param_active_links_thr_high=91
 appl_param_active_links_thr_low=1
 custom_feature_start_tx_threshold=20
+sai_ecmp_group_members_increment=8
diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/j2p-a7800r3a-36d-36x400G.config.bcm b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -1037,3 +1037,4 @@ sai_disable_srcmacqedstmac_ctrl=1
 appl_param_active_links_thr_high=91
 appl_param_active_links_thr_low=1
 custom_feature_start_tx_threshold=20
+sai_ecmp_group_members_increment=8
diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -1037,3 +1037,4 @@ sai_disable_srcmacqedstmac_ctrl=1
 appl_param_active_links_thr_high=91
 appl_param_active_links_thr_low=1
 custom_feature_start_tx_threshold=20
+sai_ecmp_group_members_increment=8
diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -1057,3 +1057,4 @@ sai_disable_srcmacqedstmac_ctrl=1
 appl_param_active_links_thr_high=91
 appl_param_active_links_thr_low=1
 custom_feature_start_tx_threshold=20
+sai_ecmp_group_members_increment=8
diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -1057,3 +1057,4 @@ sai_disable_srcmacqedstmac_ctrl=1
 appl_param_active_links_thr_high=91
 appl_param_active_links_thr_low=1
 custom_feature_start_tx_threshold=20
+sai_ecmp_group_members_increment=8
diff --git a/device/nexthop/x86_64-nexthop_5010-r0/NH-5010-F-O32-C32/nh5010-default.bcm b/device/nexthop/x86_64-nexthop_5010-r0/NH-5010-F-O32-C32/nh5010-default.bcm
@@ -2269,3 +2269,4 @@ macsec_fips_enable=1
 xflow_macsec_secure_chan_to_num_secure_assoc=4
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
+sai_ecmp_group_members_increment=8
diff --git a/device/nexthop/x86_64-nexthop_5010-r0/NH-5010-F-O64/defaults/nh5010.bcm b/device/nexthop/x86_64-nexthop_5010-r0/NH-5010-F-O64/defaults/nh5010.bcm
@@ -2275,4 +2275,5 @@ sai_default_cpu_tx_tc=7
 macsec_fips_enable=1
 xflow_macsec_secure_chan_to_num_secure_assoc=4
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
-xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
+xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
+sai_ecmp_group_members_increment=8
diff --git a/device/nokia/x86_64-nokia_ixr7250_x1b-r0/Nokia-IXR7250-X1b/q2cp-nokia-24x100g-12x400g-config.bcm b/device/nokia/x86_64-nokia_ixr7250_x1b-r0/Nokia-IXR7250-X1b/q2cp-nokia-24x100g-12x400g-config.bcm
@@ -1682,3 +1682,4 @@ sai_pfc_dlr_init_capability=0
 trunk_group_max_members=16
 sai_default_cpu_tx_tc=7
 sai_instru_stat_accum_enable=1
+sai_ecmp_group_members_increment=8
diff --git a/device/nokia/x86_64-nokia_ixr7250_x3b-r0/Nokia-IXR7250-X3B/0/jr2cp-nokia-18x400g-config.bcm b/device/nokia/x86_64-nokia_ixr7250_x3b-r0/Nokia-IXR7250-X3B/0/jr2cp-nokia-18x400g-config.bcm
@@ -2153,3 +2153,4 @@ trunk_group_max_members=16
 sai_default_cpu_tx_tc=7
 sai_disable_srcmacqedstmac_ctrl=1
 sai_instru_stat_accum_enable=1
+sai_ecmp_group_members_increment=8
diff --git a/device/nokia/x86_64-nokia_ixr7250_x3b-r0/Nokia-IXR7250-X3B/1/jr2cp-nokia-18x400g-config.bcm b/device/nokia/x86_64-nokia_ixr7250_x3b-r0/Nokia-IXR7250-X3B/1/jr2cp-nokia-18x400g-config.bcm
@@ -2157,3 +2157,4 @@ trunk_group_max_members=16
 sai_default_cpu_tx_tc=7
 sai_disable_srcmacqedstmac_ctrl=1
 sai_instru_stat_accum_enable=1
+sai_ecmp_group_members_increment=8
diff --git a/device/nokia/x86_64-nokia_ixr7250_x4-r0/Nokia-IXR7250-X4/q3d-nokia-32x800g-config.bcm b/device/nokia/x86_64-nokia_ixr7250_x4-r0/Nokia-IXR7250-X4/q3d-nokia-32x800g-config.bcm
@@ -1353,3 +1353,4 @@ sai_disable_srcmacqedstmac_ctrl=1
 trunk_group_max_members=16
 sai_default_cpu_tx_tc=7
 sai_tc_based_queue_stats_enable=0
+sai_ecmp_group_members_increment=8
diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm
@@ -2103,3 +2103,4 @@ sai_disable_srcmacqedstmac_ctrl=1
 sai_instru_stat_accum_enable=1
 appl_param_active_links_thr_low=1
 appl_param_active_links_thr_high=112
+sai_ecmp_group_members_increment=8
diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm
@@ -2104,3 +2104,4 @@ sai_disable_srcmacqedstmac_ctrl=1
 sai_instru_stat_accum_enable=1
 appl_param_active_links_thr_low=1
 appl_param_active_links_thr_high=112
+sai_ecmp_group_members_increment=8
diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm
@@ -2104,3 +2104,4 @@ sai_disable_srcmacqedstmac_ctrl=1
 sai_instru_stat_accum_enable=1
 appl_param_active_links_thr_low=1
 appl_param_active_links_thr_high=112
+sai_ecmp_group_members_increment=8
diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm
@@ -2106,3 +2106,4 @@ sai_disable_srcmacqedstmac_ctrl=1
 sai_instru_stat_accum_enable=1
 appl_param_active_links_thr_low=1
 appl_param_active_links_thr_high=112
+sai_ecmp_group_members_increment=8
diff --git a/dockers/docker-orchagent/orchagent.sh b/dockers/docker-orchagent/orchagent.sh
@@ -62,6 +62,12 @@ if [[ "$NAMESPACE_ID" ]]; then
     ORCHAGENT_ARGS+="-f swss.asic$NAMESPACE_ID.rec -j sairedis.asic$NAMESPACE_ID.rec "
 fi
 
+# Enable async swss recorder when explicitly configured
+ASYNC_SWSS_REC=$(sonic-db-cli CONFIG_DB hget "DEVICE_METADATA|localhost" "async_swss_rec")
+if [ "$ASYNC_SWSS_REC" == "enabled" ]; then
+    ORCHAGENT_ARGS+="-A "
+fi
+
 # Add platform specific arguments if necessary
 if [ "$platform" == "broadcom" ]; then
     ORCHAGENT_ARGS+="-m $MAC_ADDRESS"
diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2
@@ -103,7 +103,7 @@ RUN apt-get update          \
         quilt               \
     && rm -rf /var/lib/apt/lists/*
 
-# Install Go toolchain for building grpcurl and gnoic from source
+# Install Go toolchain for building grpcurl and gnmic from source
 # to ensure they use a patched Go stdlib (GO-2026-4337: crypto/tls)
 {% if CONFIGURED_ARCH == "armhf" %}
 RUN GO_ARCH=armv6l \
@@ -411,20 +411,6 @@ RUN cd gnxi \
 # Deactivating a virtualenv.
 # ENV PATH="$BACKUP_OF_PATH"
 
-# Build gnoic from source with patched Go and golang.org/x/* deps
-# upgraded to latest to address current and future golang.org/x/* CVEs.
-RUN git clone https://github.com/karimra/gnoic.git \
-    && cd gnoic \
-    && git checkout 27bc5a6 \
-    && go get google.golang.org/grpc@v1.79.3 \
-    && go get github.com/go-viper/mapstructure/v2@v2.4.0 \
-    && go get github.com/go-jose/go-jose/v4@latest \
-    && go get golang.org/x/crypto@latest golang.org/x/net@latest golang.org/x/text@latest golang.org/x/sys@latest golang.org/x/oauth2@latest \
-    && go mod tidy \
-    && go build -o /usr/local/bin/gnoic . \
-    && cd .. \
-    && rm -rf gnoic /root/go/pkg/mod /root/.cache/go-build
-
 # Build gnmic from source with upgraded deps to address known CVEs
 COPY gocloud-patches/ /tmp/gocloud-patches/
 RUN GNMIC_VERSION=v0.43.0 \
diff --git a/files/build/versions-public/default/versions-git b/files/build/versions-public/default/versions-git
@@ -10,7 +10,6 @@ https://github.com/FreeRADIUS/pam_radius.git==d17fc655f0007728b67d0d25c0ca20b604
 https://github.com/fullstorydev/grpcurl.git==d00c28104be4b06f4dd887196ccfc57b054aa069
 https://github.com/google/gnxi.git==987664c754f18c0b9ea39b2de86317c14c226d5b
 https://github.com/jeroennijhof/pam_tacplus.git==b839c440e33c36eced9dcbc287fcfe6237c4c4ce
-https://github.com/karimra/gnoic.git==27bc5a65d391d07c903f6cd0a05b73219657e00d
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/openconfig/gnmic.git==883b7f9ab0d486f9dc9272a1018070d7f23197b7
 https://github.com/openconfig/oc-pyang.git==a116b53b1c1a149bc9a5d42dc26f3d0ab797846a
diff --git a/functions.sh b/functions.sh
@@ -40,13 +40,13 @@ die() {
 docker_try_rmi() {
     local image_name="$1"
     ## Note: inspect output has quotation characters, so sed to remove it as an argument
-    local image_id=$(docker inspect --format="{{json .Id}}" $image_name | sed -e 's/^"//' -e 's/"$//')
+    local image_id=$(docker inspect --format="{{json .Id}}" "$image_name" | sed -e 's/^"//' -e 's/"$//')
     [ -z "$image_id" ] || {
         ## Remove all the exited containers from this image
-        docker ps -a -q -f "status=exited" -f "ancestor=$1" | xargs --no-run-if-empty docker rm
+        docker ps -a -q -f "status=exited" -f "ancestor=$image_name" | xargs --no-run-if-empty docker rm
         ## Note: If there are running containers from this image, the build system is in an
         ##   unexpected state. The 'rmi' will fail and we need investigate the build environment.
-        docker rmi $image_name
+        docker rmi "$image_name"
     }
 }
 
diff --git a/platform/alpinevs b/platform/alpinevs
@@ -1 +1 @@
-Subproject commit 82c88a71de22ce0dd77f0e7ca4928bec59be3807
+Subproject commit d484f504a4e3c6097a5b7d06139640608de7e1cc
diff --git a/src/sonic-device-data/tests/permitted_list b/src/sonic-device-data/tests/permitted_list
@@ -366,3 +366,4 @@ appl_param_rcy_mirror_ports_range
 rcy_mirror_to_forward_port_map
 port_priorities_sch
 sai_lag_default_crc_hash
+sai_ecmp_group_members_increment
diff --git a/src/sonic-sairedis b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 291e322b2b51e26b2f0b3bfe9952a6885a80e57e
+Subproject commit 31722030e628256dcc78b1b3ff714dc1ec12e018
diff --git a/src/sonic-yang-models/yang-models/sonic-device_metadata.yang b/src/sonic-yang-models/yang-models/sonic-device_metadata.yang
@@ -19,6 +19,10 @@ module sonic-device_metadata {
 
     description "DEVICE_METADATA YANG Module for SONiC OS";
 
+    revision 2026-04-10 {
+        description "Added async_swss_rec field to control async swss recorder.";
+    }
+
     revision 2021-02-27 {
         description "Added frr_mgmt_framework_config field to handle BGP
             config DB schema events to configure FRR protocols.";
@@ -247,6 +251,15 @@ module sonic-device_metadata {
                         error-message "ASIC synchronous mode must be enabled in order to enable suppress FIB pending feature";
                     }
                 }
+
+                leaf async_swss_rec {
+                    description "Enable asynchronous swss.rec recording in orchagent.";
+                    type enumeration {
+                        enum enabled;
+                        enum disabled;
+                    }
+                    default disabled;
+                }
                 leaf rack_mgmt_map {
                     type string {
                         length 0..128 {
