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

bgpd: Set last reset reason to admin shutdown if it was manually (backport #16242) #16277

Closed
wants to merge 2 commits into from
Closed

bgpd: Set last reset reason to admin shutdown if it was manually (backport #16242) #16277

wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 24, 2024

Closes #16238

This is an automatic backport of pull request #16242 done by Mergify.

ton31337 added 2 commits June 24, 2024 19:42
@ton31337 @mergify
bgpd: Set last reset reason to admin shutdown if it was manually
226f7b4 
Before this patch, we always printed the last reason "Waiting for OPEN", but
if it's a manual shutdown, then we technically are not waiting for OPEN.

Signed-off-by: Donatas Abraitis <[email protected]>
(cherry picked from commit c25c7e9)

# Conflicts:
#	bgpd/bgpd.c
@ton31337 @mergify
bgpd: Remove redundant whitespace before printing the reason of the f…
c95755f 
…ailed peer

Before:

```
Neighbor        EstdCnt DropCnt ResetTime Reason
127.0.0.1             0       0     never  Waiting for peer OPEN (n/a)
```

After:

```
Neighbor        EstdCnt DropCnt ResetTime Reason
127.0.0.1             0       0     never Waiting for peer OPEN (n/a)
```

Signed-off-by: Donatas Abraitis <[email protected]>
(cherry picked from commit b5bd626)
@mergify mergify bot added the conflicts label Jun 24, 2024
@mergify Mergify
Copy link
Author

mergify bot commented Jun 24, 2024

Cherry-pick of c25c7e9 has failed:

On branch mergify/bp/stable/9.0/pr-16242
Your branch is up to date with 'origin/stable/9.0'.

You are currently cherry-picking commit c25c7e929d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   bgpd/bgpd.c

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Jun 24, 2024
Merged
@frrbot frrbot bot added the bgp label Jun 24, 2024
@ton31337
Copy link
Member

Manual backport here #16286, closing this.

@ton31337 ton31337 closed this Jun 25, 2024
@ton31337 ton31337 deleted the mergify/bp/stable/9.0/pr-16242 branch June 25, 2024 05:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
bgp size/S stable/9.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@ton31337