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.

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

Use temp view also in fast-reboot #1401

Merged
merged 1 commit into from
Nov 27, 2024

Conversation

arfeigin
Copy link
Contributor

@arfeigin arfeigin commented Jul 4, 2024

syncd_init_common.sh is checking fast-reboot by reading /proc/cmdline. However, /proc/cmdline will not change after config reload. So, consider a case like fast-reboot -> config reload. In the config reload process, syncd_init_common.sh will also treat it as fast-reboot and probably enter wrong logic.

@arfeigin
Copy link
Contributor Author

arfeigin commented Jul 4, 2024

@kcudnik Can you please help reviewing this PR?

@arfeigin arfeigin requested a review from vaibhavhd July 8, 2024 16:30
@arfeigin
Copy link
Contributor Author

arfeigin commented Jul 8, 2024

@vaibhavhd Can you please reviewing this PR?

@Junchao-Mellanox
Copy link
Contributor

Hi @vaibhavhd , could you please help review this?

@@ -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

Copy link
Contributor

@vaibhavhd vaibhavhd left a comment

Choose a reason for hiding this comment

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

Please update the PR with the test results.

@stepanblyschak
Copy link
Contributor

@vaibhavhd The change is in our internal 202405 branch and running in regression for few month now with no issues related to fast-reboot

@bingwang-ms
Copy link
Contributor

bingwang-ms commented Oct 21, 2024

@arfeigin Can you please sync with master branch? The PR can't be merged because it's out-of-date with master branch

@dprital dprital force-pushed the master_fast-reboot_temp-view branch from e6f62e1 to 76cd998 Compare November 25, 2024 19:08
@dprital
Copy link
Collaborator

dprital commented Nov 26, 2024

@bingwang-ms , Can you please merge and cherry pick to 202405 ?

@kcudnik kcudnik merged commit 7817c3b into sonic-net:master Nov 27, 2024
18 checks passed
mssonicbld pushed a commit to mssonicbld/sonic-sairedis that referenced this pull request Nov 30, 2024
syncd_init_common.sh is checking fast-reboot by reading /proc/cmdline. However, /proc/cmdline will not change after config reload. So, consider a case like fast-reboot -> config reload. In the config reload process, syncd_init_common.sh will also treat it as fast-reboot and probably enter wrong logic.
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202405: #1476

mssonicbld pushed a commit that referenced this pull request Nov 30, 2024
syncd_init_common.sh is checking fast-reboot by reading /proc/cmdline. However, /proc/cmdline will not change after config reload. So, consider a case like fast-reboot -> config reload. In the config reload process, syncd_init_common.sh will also treat it as fast-reboot and probably enter wrong logic.
shiraez pushed a commit to Marvell-switching/sonic-sairedis that referenced this pull request Dec 12, 2024
syncd_init_common.sh is checking fast-reboot by reading /proc/cmdline. However, /proc/cmdline will not change after config reload. So, consider a case like fast-reboot -> config reload. In the config reload process, syncd_init_common.sh will also treat it as fast-reboot and probably enter wrong logic.
shiraez pushed a commit to Marvell-switching/sonic-sairedis that referenced this pull request Dec 12, 2024
syncd_init_common.sh is checking fast-reboot by reading /proc/cmdline. However, /proc/cmdline will not change after config reload. So, consider a case like fast-reboot -> config reload. In the config reload process, syncd_init_common.sh will also treat it as fast-reboot and probably enter wrong logic.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants