Skip to content
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

Jump to bottom

Use temp view also in fast-reboot #1401

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Use temp view also in fast-reboot #1401

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eedce49
Use temp view also in fast-reboot
arfeigin Jul 2, 2024
f482ad4
Merge branch 'master' into master_fast-reboot_temp-view
vaibhavhd Aug 12, 2024
e6f62e1
Merge branch 'sonic-net:master' into master_fast-reboot_temp-view
arfeigin Aug 26, 2024
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
6 changes: 2 additions & 4 deletions syncd/scripts/syncd_init_common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,8 @@ else
CMD_ARGS=
fi

# Use temporary view between init and apply except when in fast-reboot
if [[ "$(cat /proc/cmdline)" != *"SONIC_BOOT_TYPE=fast-reboot"* ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can still keep the check but change the condition. There is a system wide fast-reboot flag that is now used.
May be using that flag is better than 1) removing the check 2) using cmdline which does not change.

Besides, in the current change it is not just fixing the problem with config reload (after fast-reboot). This PR will change the behavior of the fast-reboot as well.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vaibhavhd The motivation of this PR is to also use -u in fast-reboot. This is required for PR #1396

CMD_ARGS+=" -u"
fi
# Use temporary view between init view and apply view
CMD_ARGS+=" -u"

# Create a folder for SAI failure dump files
mkdir -p /var/log/sai_failure_dump/
Expand Down
Loading