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

Revert frr service to systemd control and daemons to watchfrr control #3486

Closed
wants to merge 5 commits into from

Conversation

nikos-github
Copy link
Collaborator

@nikos-github nikos-github commented Sep 19, 2019

Diffs are fixing the following issues: #3194 #3195 #3196 #3197 #3484

As agreed, frr service is reverted back to being controlled via systemd and its daemons via watchfrr. This is fixing a bunch of issues encountered and also allows for incremental configs to be pushed to frr in a non-disruptive way. The bgpcfgd daemon and fpm, will continue being under supervisord's control.

@lguohan @pavel-shirshov Please review.

FYI: @ben-gale @MichelMoriniaux @mslocrian @heidinet2007

@nikos-github
Copy link
Collaborator Author

@lguohan Can we please review this since it is addressing 5 reported issues?

Copy link
Contributor

@pavel-shirshov pavel-shirshov left a comment

Choose a reason for hiding this comment

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

As comments

rules/docker-fpm-frr.mk Show resolved Hide resolved
dockers/docker-fpm-frr/supervisord.conf Show resolved Hide resolved
dockers/docker-fpm-frr/Dockerfile.j2 Show resolved Hide resolved
@pavel-shirshov
Copy link
Contributor

@nikos-github Can you please comment on my other questions?

@nikos-github
Copy link
Collaborator Author

@nikos-github Can you please comment on my other questions?

@pavel-shirshov All questions answered.

@nikos-github
Copy link
Collaborator Author

@pavel-shirshov All questions answered. We really need to resolve the issues these changes are fixing.

@pavel-shirshov
Copy link
Contributor

@nikos-github We don't want python3 inside bgp docker container.

@nikos-github
Copy link
Collaborator Author

nikos-github commented Oct 1, 2019

@nikos-github We don't want python3 inside bgp docker container.

@pavel-shirshov It's been like this since the default routing stack changed to frr and python2 support is going away. What do you think is breaking? frr-pythontools has to work and we want to rely on frr for support as is. There is no functional requirement to diverge on this. Increase in size is not a good enough reason. This functionality existed, it got broken and needs to be reinstated.

@pavel-shirshov
Copy link
Contributor

@nikos-github Image size it's a big deal for us. So let's wait for Guohan's review

@nikos-github
Copy link
Collaborator Author

nikos-github commented Oct 3, 2019

@nikos-github Image size it's a big deal for us. So let's wait for Guohan's review

@pavel-shirshov We are in agreement here but I think we need to take into account that (a) The functionality existed and with python3 before it broke and we approved this. Why should this be a problem now that we are re-instating the functionality? (b) We don't want for something like that to diverge from frr and maintain a patch and rather rely on frr to do the heavy lifting of support for the tools (c) python2 support is going away in 3 months and while we may stick to python2 is sonic for a very long time, I don't believe we can afford to be making such exceptions and incur an overhead for upstream functionality (d) Image size can be reduced by moving non-mainstream dockers to a docker registry for download/pull on demand.

@pavel-shirshov
Copy link
Contributor

@nikos-github Will the change work with warm-reboot procedure? Can you please check?
https://github.com/Azure/sonic-utilities/blob/eb2723498b35b886d3a168971e9c7cfa8bc497f9/scripts/fast-reboot#L408

@nikos-github
Copy link
Collaborator Author

nikos-github commented Oct 11, 2019

Will the change work with warm-reboot procedure? Can you please check?
https://github.com/Azure/sonic-utilities/blob/eb2723498b35b886d3a168971e9c7cfa8bc497f9/scripts/fast-reboot#L408

@pavel-shirshov It needs to change to include watchfrr kill first: docker exec -i bgp pkill -9 watchfrr

Do you want me to change it or do you want to do that? Let me know.

rm -f /var/run/rsyslogd.pid

service rsyslog start
service frr start
Copy link
Collaborator

Choose a reason for hiding this comment

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

we already have supervised to start frr process, it is good to unified all process management inside the docker. We have unified way to manage process restart, docker restart, process crash messages. I do not really understand why we need to change that.

Copy link
Collaborator Author

@nikos-github nikos-github Oct 16, 2019

Choose a reason for hiding this comment

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

I don't really understand either why we had to change from systemd in the first place. There was no functional requirement in the first place to change to supervisord. I don't see the goodness in unifying all process management inside the docker under supervisord especially since we ended up with multiple problems out of it. The routing application should be standalone and free of any such dependancies. It also doesn't need this unification. These changes were agreed in the August meeting we had and I sent meeting minutes. I also fail to understand why we are holding this PR as hostage when it fixes 5 blocking critical issues for a month now.

@lguohan lguohan closed this Jan 22, 2020
mssonicbld added a commit that referenced this pull request Sep 16, 2024
…atically (#20268)

#### Why I did it
src/sonic-utilities
```
* ed624895 - (HEAD -> master, origin/master, origin/HEAD) SONIC CLI for CLI-Sessions feature (#3175) (2 hours ago) [i-davydenko]
* c6637553 - Move from bootctl to mokutil when checking for Secure Boot status (#3486) (3 hours ago) [DavidZagury]
* 5fc0ee6c - [spm]: Clean up timers auto generation logic. (#3523) (3 hours ago) [Nazarii Hnydyn]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Sep 18, 2024
…atically (#20288)

#### Why I did it
src/sonic-utilities
```
* 2fd5f153 - (HEAD -> 202405, origin/202405) Move from bootctl to mokutil when checking for Secure Boot status (#3486) (7 hours ago) [DavidZagury]
```
#### How I did it
#### How to verify it
#### Description for the changelog
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.

3 participants