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

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

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.

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.

6 participants