Skip to content

Fix saisrver startup process and dependencies #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
richardyu-ms merged 6 commits into from
Mar 16, 2022
Merged

Fix saisrver startup process and dependencies #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
67c8bcb
rebase code to master
richardyu-ms Feb 24, 2022
2d7c947
rebase to master
richardyu-ms Feb 24, 2022
a4847e1
add bfn dependences for saiserver and fix a defect
richardyu-ms Jan 15, 2022
9508855
rebase to master
richardyu-ms Feb 24, 2022
44f91bd
Fix saisrver startup process and dependencies
Mar 7, 2022
435ee2c
Merge branch 'bfn_saiserverv2_support' into myron/saiserverv2_startup
richardyu-ms Mar 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion platform/barefoot/bfn-sai.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ $(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev

$(BFN_SAI)_DEPENDS += $(LIBNL_GENL3_DEV)
$(eval $(call add_conflict_package,$(BFN_SAI),$(LIBSAIVS_DEV)))
$(BFN_SAI)_RDEPENDS += $(LIBNL_GENL3)
$(BFN_SAI)_RDEPENDS += $(LIBNL_GENL3) $(BFN_PLATFORM)

SONIC_ONLINE_DEBS += $(BFN_SAI)
$(BFN_SAI_DEV)_DEPENDS += $(BFN_SAI)
2 changes: 2 additions & 0 deletions platform/barefoot/docker-saiserver-bfn/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update \
&& apt-get -y install \
gdb \
libedit2 \
libboost-atomic1.71.0

COPY \
Expand All @@ -23,6 +24,7 @@ debs/
{{ install_debian_packages(docker_saiserver_bfn_debs.split(' ')) }}

COPY ["start.sh", "/usr/bin/"]
COPY ["start_saiserver.sh", "/usr/bin/"]

COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]

Expand Down
15 changes: 15 additions & 0 deletions platform/barefoot/docker-saiserver-bfn/start_saiserver.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/usr/bin/env bash

# Check and load SDE profile
P4_PROFILE=$(sonic-cfggen -d -v 'DEVICE_METADATA["localhost"]["p4_profile"]')
if [[ -n "$P4_PROFILE" ]]; then
if [[ ( -d /opt/bfn/install_${P4_PROFILE} ) && ( -L /opt/bfn/install || ! -e /opt/bfn/install ) ]]; then
ln -srfn /opt/bfn/install_${P4_PROFILE} /opt/bfn/install
fi
fi
export PYTHONHOME=/opt/bfn/install/
export PYTHONPATH=/opt/bfn/install/
export ONIE_PLATFORM=`grep onie_platform /etc/machine.conf | awk 'BEGIN { FS = "=" } ; { print $2 }'`
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/bfn/install/lib:/opt/bfn/install/lib/platform/$ONIE_PLATFORM:/opt/bfn/install/lib:/opt/bfn/install/lib/tofinopd/switch
./opt/bfn/install/bin/dma_setup.sh
/usr/sbin/saiserver -p /etc/sai/profile.ini -f /etc/sai/portmap.ini
2 changes: 1 addition & 1 deletion platform/barefoot/docker-saiserver-bfn/supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ stdout_logfile=syslog
stderr_logfile=syslog

[program:saiserver]
command=/usr/sbin/saiserver -p /etc/sai/profile.ini -f /etc/sai/portmap.ini
command=/usr/bin/start_saiserver.sh
priority=3
autostart=false
autorestart=false
Expand Down