Skip to content

Commit 339cfbf

Browse files
shi-sushi-su
authored
Remove the configuration of synchronous mode from init_cfg.json (#5308)
Remove the configuration of synchronous mode from init_cfg.json
1 parent 7e2fa7d commit 339cfbf

File tree

11 files changed

+3
-42
lines changed

11 files changed

+3
-42
lines changed

‎.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,3 @@ platform/broadcom/sonic-platform-modules-dell/s6100/modules/dell_s6100_lpc.c
6161
platform/broadcom/sonic-platform-modules-dell/z9100/modules/dell_ich.c
6262
platform/broadcom/sonic-platform-modules-dell/z9100/modules/dell_mailbox.c
6363
platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/ipmihelper.py
64-
platform/vs/docker-sonic-vs/init_cfg.json
65-
platform/p4/docker-sonic-p4/init_cfg.json

‎Makefile.work

-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
# * SONIC_DPKG_CACHE_METHOD: Specifying method of obtaining the Debian packages from cache: none or cache
3939
# * SONIC_DPKG_CACHE_SOURCE: Debian package cache location when cache enabled for debian packages
4040
# * BUILD_LOG_TIMESTAMP: Set timestamp in the build log (simple/none)
41-
# * ENABLE_SYNCHRONOUS_MODE: Enable synchronous mode between orchagent and syncd
4241
#
4342
###############################################################################
4443

@@ -218,7 +217,6 @@ SONIC_BUILD_INSTRUCTION := make \
218217
EXTRA_DOCKER_TARGETS=$(EXTRA_DOCKER_TARGETS) \
219218
BUILD_LOG_TIMESTAMP=$(BUILD_LOG_TIMESTAMP) \
220219
SONIC_ENABLE_IMAGE_SIGNATURE=$(ENABLE_IMAGE_SIGNATURE) \
221-
ENABLE_SYNCHRONOUS_MODE=$(ENABLE_SYNCHRONOUS_MODE) \
222220
$(SONIC_OVERRIDE_BUILD_VARS)
223221

224222
.PHONY: sonic-slave-build sonic-slave-bash init reset

‎files/build_templates/init_cfg.json.j2

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"DEVICE_METADATA": {
33
"localhost": {
44
"default_bgp_status": {% if shutdown_bgp_on_start == "y" %}"down"{% else %}"up"{% endif %},
5-
"default_pfcwd_status": {% if enable_pfcwd_on_start == "y" %}"enable"{% else %}"disable"{% endif %},
6-
"synchronous_mode": {% if enable_synchronous_mode == "y" %}"enable"{% else %}"disable"{% endif %}
5+
"default_pfcwd_status": {% if enable_pfcwd_on_start == "y" %}"enable"{% else %}"disable"{% endif %}
76
}
87
},
98
"CRM": {

‎platform/p4/docker-sonic-p4/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ COPY ["start.sh", "orchagent.sh", "config_bm.sh", "/usr/bin/"]
7878
COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
7979
COPY ["files/configdb-load.sh", "/usr/bin/"]
8080
COPY ["files/arp_update", "/usr/bin"]
81-
COPY ["init_cfg.json", "/etc/sonic/"]
8281
RUN echo "docker-sonic-p4" > /etc/hostname
8382
RUN touch /etc/quagga/zebra.conf
8483

‎platform/p4/docker-sonic-p4/init_cfg.json.j2

-7
This file was deleted.

‎platform/p4/docker-sonic-p4/start.sh

+1-6
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,7 @@ if ! ip link show eth0 &> /dev/null; then
88
fi
99

1010
SYSTEM_MAC_ADDRESS=$(ip link show eth0 | grep ether | awk '{print $2}')
11-
if [ -f /etc/sonic/init_cfg.json ]; then
12-
sonic-cfggen -j /etc/sonic/init_cfg.json -a '{"DEVICE_METADATA":{"localhost": {"mac": "'$SYSTEM_MAC_ADDRESS'"}}}' --print-data > /tmp/init_cfg.json
13-
mv /tmp/init_cfg.json /etc/sonic/init_cfg.json
14-
else
15-
sonic-cfggen -a '{"DEVICE_METADATA":{"localhost": {"mac": "'$SYSTEM_MAC_ADDRESS'"}}}' --print-data > /etc/sonic/init_cfg.json
16-
fi
11+
sonic-cfggen -a '{"DEVICE_METADATA":{"localhost": {"mac": "'$SYSTEM_MAC_ADDRESS'"}}}' --print-data > /etc/sonic/init_cfg.json
1712

1813
if [ -f /etc/sonic/config_db.json ]; then
1914
sonic-cfggen -j /etc/sonic/init_cfg.json -j /etc/sonic/config_db.json --print-data > /tmp/config_db.json

‎platform/vs/docker-sonic-vs/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ COPY ["files/configdb-load.sh", "/usr/bin/"]
133133
COPY ["files/arp_update", "/usr/bin/"]
134134
COPY ["files/buffers_config.j2", "files/qos_config.j2", "/usr/share/sonic/templates/"]
135135
COPY ["files/sonic_version.yml", "/etc/sonic/"]
136-
COPY ["init_cfg.json", "/etc/sonic/"]
137136
COPY ["database_config.json", "/etc/default/sonic-db/"]
138137
COPY ["hostname.j2", "/usr/share/sonic/templates/"]
139138
COPY ["default_chassis_cfg.json", "/etc/default/sonic-db/"]

‎platform/vs/docker-sonic-vs/init_cfg.json.j2

-7
This file was deleted.

‎platform/vs/docker-sonic-vs/start.sh

+1-6
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,7 @@ if [[ -f /usr/share/sonic/virtual_chassis/default_config.json ]]; then
3232
fi
3333

3434
SYSTEM_MAC_ADDRESS=$(ip link show eth0 | grep ether | awk '{print $2}')
35-
if [ -f /etc/sonic/init_cfg.json ]; then
36-
sonic-cfggen -j /etc/sonic/init_cfg.json -a '{"DEVICE_METADATA":{"localhost": {"mac": "'$SYSTEM_MAC_ADDRESS'"}}}' $CHASS_CFG --print-data > /tmp/init_cfg.json
37-
mv /tmp/init_cfg.json /etc/sonic/init_cfg.json
38-
else
39-
sonic-cfggen -a '{"DEVICE_METADATA":{"localhost": {"mac": "'$SYSTEM_MAC_ADDRESS'"}}}' $CHASS_CFG --print-data > /etc/sonic/init_cfg.json
40-
fi
35+
sonic-cfggen -a '{"DEVICE_METADATA":{"localhost": {"mac": "'$SYSTEM_MAC_ADDRESS'"}}}' $CHASS_CFG --print-data > /etc/sonic/init_cfg.json
4136

4237
if [ -f /etc/sonic/config_db.json ]; then
4338
sonic-cfggen -j /etc/sonic/init_cfg.json -j /etc/sonic/config_db.json --print-data > /tmp/config_db.json

‎rules/config

-3
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,3 @@ K8s_GCR_IO_PAUSE_VERSION = 3.2
158158
# CA_CERT =
159159
# The relative path is build root folder.
160160
SONIC_ENABLE_IMAGE_SIGNATURE ?= n
161-
162-
# ENABLE_SYNCHRONOUS_MODE - enable synchronous mode between orchagent and syncd
163-
ENABLE_SYNCHRONOUS_MODE = n

‎slave.mk

-5
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@ $(info "INCLUDE_SFLOW" : "$(INCLUDE_SFLOW)")
232232
$(info "INCLUDE_NAT" : "$(INCLUDE_NAT)")
233233
$(info "INCLUDE_KUBERNETES" : "$(INCLUDE_KUBERNETES)")
234234
$(info "TELEMETRY_WRITABLE" : "$(TELEMETRY_WRITABLE)")
235-
$(info "ENABLE_SYNCHRONOUS_MODE" : "$(ENABLE_SYNCHRONOUS_MODE)")
236235
$(info )
237236
else
238237
$(info SONiC Build System for $(CONFIGURED_PLATFORM):$(CONFIGURED_ARCH))
@@ -253,7 +252,6 @@ endif
253252

254253
export kernel_procure_method=$(KERNEL_PROCURE_METHOD)
255254
export vs_build_prepare_mem=$(VS_PREPARE_MEM)
256-
export enable_synchronous_mode=$(ENABLE_SYNCHRONOUS_MODE)
257255

258256
###############################################################################
259257
## Local targets
@@ -702,9 +700,6 @@ $(addprefix $(TARGET_PATH)/, $(DOCKER_IMAGES)) : $(TARGET_PATH)/%.gz : .platform
702700
$(eval export $(subst -,_,$(notdir $($*.gz_PATH)))_whls=$(shell printf "$(subst $(SPACE),\n,$(call expand,$($*.gz_PYTHON_WHEELS)))\n" | awk '!a[$$0]++'))
703701
$(eval export $(subst -,_,$(notdir $($*.gz_PATH)))_dbgs=$(shell printf "$(subst $(SPACE),\n,$(call expand,$($*.gz_DBG_PACKAGES)))\n" | awk '!a[$$0]++'))
704702
j2 $($*.gz_PATH)/Dockerfile.j2 > $($*.gz_PATH)/Dockerfile
705-
if [ -f $($*.gz_PATH)/init_cfg.json.j2 ] ; then
706-
j2 $($*.gz_PATH)/init_cfg.json.j2 > $($*.gz_PATH)/init_cfg.json
707-
fi
708703
docker info $(LOG)
709704
docker build --squash --no-cache \
710705
--build-arg http_proxy=$(HTTP_PROXY) \

0 commit comments

Comments
 (0)