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

bgpd: config connect timer not applied immediately for non-established peers. #7449

Merged

Conversation

sudhanshukumar22
Copy link
Contributor

@sudhanshukumar22 sudhanshukumar22 commented Nov 4, 2020

Description:
When user is config connect timer, it doesn't reflect
immediately. It reflect when next time neighbor is tried to reconnect.

Problem Description/Summary :
When user is config connect timer, it doesn't reflect
The network connection was aborted by the local system.d to reconnect.
Fix is to update the connect timer immediately if BGP
session is not in establish state.

Expected Behavior :
If neighbor is not yet established, we should immediately apply the config connect timer to the peer.

Signed-off-by: sudhanshukumar22 sudhanshu.kumar@broadcom.com

@polychaeta polychaeta added the bgp label Nov 4, 2020
Copy link

@polychaeta polychaeta left a comment

Choose a reason for hiding this comment

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

Thanks for your contribution to FRR!

Click for style suggestions

To apply these suggestions:

curl -s https://gist.githubusercontent.com/polychaeta/21cfe5b2e07a924983b6036b1167a5e4/raw/0d0cf4ce9899f8865166fab7faaa0323fa85c47f/cr_7449_1604467447.diff | git apply

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index cc114bb94..aa9b592c8 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -5166,11 +5166,12 @@ int peer_timers_connect_set(struct peer *peer, uint32_t connect)
 	peer->connect = connect;
 	peer->v_connect = connect;
 
-        if (!CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP) && (peer->status != Established) ) {
-                if (peer_active(peer))
-                        BGP_EVENT_ADD(peer, BGP_Stop);
-                BGP_EVENT_ADD(peer, BGP_Start);
-        }
+	if (!CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP)
+	    && (peer->status != Established)) {
+		if (peer_active(peer))
+			BGP_EVENT_ADD(peer, BGP_Stop);
+		BGP_EVENT_ADD(peer, BGP_Start);
+	}
 
 	/* Skip peer-group mechanics for regular peers. */
 	if (!CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP))
@@ -5190,12 +5191,11 @@ int peer_timers_connect_set(struct peer *peer, uint32_t connect)
 		member->connect = connect;
 		member->v_connect = connect;
 
-                if (member->status != Established) {
-                        if (peer_active(member))
-                                BGP_EVENT_ADD(member, BGP_Stop);
-                        BGP_EVENT_ADD(member, BGP_Start);
-                }
-
+		if (member->status != Established) {
+			if (peer_active(member))
+				BGP_EVENT_ADD(member, BGP_Stop);
+			BGP_EVENT_ADD(member, BGP_Start);
+		}
 	}
 
 	return 0;
@@ -5222,11 +5222,12 @@ int peer_timers_connect_unset(struct peer *peer)
 	else
 		peer->v_connect = peer->bgp->default_connect_retry;
 
-        if (!CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP) && (peer->status != Established) ) {
-                if (peer_active(peer))
-                        BGP_EVENT_ADD(peer, BGP_Stop);
-                BGP_EVENT_ADD(peer, BGP_Start);
-        }
+	if (!CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP)
+	    && (peer->status != Established)) {
+		if (peer_active(peer))
+			BGP_EVENT_ADD(peer, BGP_Stop);
+		BGP_EVENT_ADD(peer, BGP_Start);
+	}
 
 	/* Skip peer-group mechanics for regular peers. */
 	if (!CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP))
@@ -5246,11 +5247,11 @@ int peer_timers_connect_unset(struct peer *peer)
 		member->connect = 0;
 		member->v_connect = peer->bgp->default_connect_retry;
 
-                if (member->status != Established) {
-                        if (peer_active(member))
-                                BGP_EVENT_ADD(member, BGP_Stop);
-                        BGP_EVENT_ADD(member, BGP_Start);
-                }
+		if (member->status != Established) {
+			if (peer_active(member))
+				BGP_EVENT_ADD(member, BGP_Stop);
+			BGP_EVENT_ADD(member, BGP_Start);
+		}
 	}
 
 	return 0;

If you are a new contributor to FRR, please see our contributing guidelines.

After making changes, you do not need to create a new PR. You should perform an amend or interactive rebase followed by a force push.

@LabN-CI
Copy link
Collaborator

LabN-CI commented Nov 4, 2020

Outdated results 💚

Basic BGPD CI results: SUCCESS, 0 tests failed

_ _
Result SUCCESS git merge/7449 e2b4100
Date 11/04/2020
Start 00:25:44
Finish 00:52:02
Run-Time 26:18
Total 1815
Pass 1815
Fail 0
Valgrind-Errors 0
Valgrind-Loss 0
Details vncregress-2020-11-04-00:25:44.txt
Log autoscript-2020-11-04-00:26:42.log.bz2
Memory 495 494 420

For details, please contact louberger

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Nov 4, 2020

Continuous Integration Result: SUCCESSFUL

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-15166/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Checkout code: Successful with additional warnings
Report for bgpd.c | 88 issues
===============================================
< ERROR: code indent should use tabs where possible
< #5169: FILE: /tmp/f1-5906/bgpd.c:5169:
< WARNING: please, no spaces at the start of a line
< #5169: FILE: /tmp/f1-5906/bgpd.c:5169:
< ERROR: space prohibited before that close parenthesis ')'
< #5169: FILE: /tmp/f1-5906/bgpd.c:5169:
< ERROR: code indent should use tabs where possible
< #5170: FILE: /tmp/f1-5906/bgpd.c:5170:
< WARNING: please, no spaces at the start of a line
< #5170: FILE: /tmp/f1-5906/bgpd.c:5170:
< ERROR: code indent should use tabs where possible
< #5171: FILE: /tmp/f1-5906/bgpd.c:5171:
< WARNING: please, no spaces at the start of a line
< #5171: FILE: /tmp/f1-5906/bgpd.c:5171:
< ERROR: code indent should use tabs where possible
< #5172: FILE: /tmp/f1-5906/bgpd.c:5172:
< WARNING: please, no spaces at the start of a line
< #5172: FILE: /tmp/f1-5906/bgpd.c:5172:
< ERROR: code indent should use tabs where possible
< #5173: FILE: /tmp/f1-5906/bgpd.c:5173:
< WARNING: please, no spaces at the start of a line
< #5173: FILE: /tmp/f1-5906/bgpd.c:5173:
< ERROR: code indent should use tabs where possible
< #5193: FILE: /tmp/f1-5906/bgpd.c:5193:
< WARNING: please, no spaces at the start of a line
< #5193: FILE: /tmp/f1-5906/bgpd.c:5193:
< ERROR: code indent should use tabs where possible
< #5194: FILE: /tmp/f1-5906/bgpd.c:5194:
< WARNING: please, no spaces at the start of a line
< #5194: FILE: /tmp/f1-5906/bgpd.c:5194:
< ERROR: code indent should use tabs where possible
< #5195: FILE: /tmp/f1-5906/bgpd.c:5195:
< WARNING: please, no spaces at the start of a line
< #5195: FILE: /tmp/f1-5906/bgpd.c:5195:
< ERROR: code indent should use tabs where possible
< #5196: FILE: /tmp/f1-5906/bgpd.c:5196:
< WARNING: please, no spaces at the start of a line
< #5196: FILE: /tmp/f1-5906/bgpd.c:5196:
< ERROR: code indent should use tabs where possible
< #5197: FILE: /tmp/f1-5906/bgpd.c:5197:
< WARNING: please, no spaces at the start of a line
< #5197: FILE: /tmp/f1-5906/bgpd.c:5197:
< WARNING: line over 80 characters
< #5225: FILE: /tmp/f1-5906/bgpd.c:5225:
< ERROR: code indent should use tabs where possible
< #5225: FILE: /tmp/f1-5906/bgpd.c:5225:
< WARNING: please, no spaces at the start of a line
< #5225: FILE: /tmp/f1-5906/bgpd.c:5225:
< ERROR: space prohibited before that close parenthesis ')'
< #5225: FILE: /tmp/f1-5906/bgpd.c:5225:
< ERROR: code indent should use tabs where possible
< #5226: FILE: /tmp/f1-5906/bgpd.c:5226:
< WARNING: please, no spaces at the start of a line
< #5226: FILE: /tmp/f1-5906/bgpd.c:5226:
< ERROR: code indent should use tabs where possible
< #5227: FILE: /tmp/f1-5906/bgpd.c:5227:
< WARNING: please, no spaces at the start of a line
< #5227: FILE: /tmp/f1-5906/bgpd.c:5227:
< ERROR: code indent should use tabs where possible
< #5228: FILE: /tmp/f1-5906/bgpd.c:5228:
< WARNING: please, no spaces at the start of a line
< #5228: FILE: /tmp/f1-5906/bgpd.c:5228:
< ERROR: code indent should use tabs where possible
< #5229: FILE: /tmp/f1-5906/bgpd.c:5229:
< WARNING: please, no spaces at the start of a line
< #5229: FILE: /tmp/f1-5906/bgpd.c:5229:
< ERROR: code indent should use tabs where possible
< #5249: FILE: /tmp/f1-5906/bgpd.c:5249:
< WARNING: please, no spaces at the start of a line
< #5249: FILE: /tmp/f1-5906/bgpd.c:5249:
< ERROR: code indent should use tabs where possible
< #5250: FILE: /tmp/f1-5906/bgpd.c:5250:
< WARNING: please, no spaces at the start of a line
< #5250: FILE: /tmp/f1-5906/bgpd.c:5250:
< ERROR: code indent should use tabs where possible
< #5251: FILE: /tmp/f1-5906/bgpd.c:5251:
< WARNING: please, no spaces at the start of a line
< #5251: FILE: /tmp/f1-5906/bgpd.c:5251:
< ERROR: code indent should use tabs where possible
< #5252: FILE: /tmp/f1-5906/bgpd.c:5252:
< WARNING: please, no spaces at the start of a line
< #5252: FILE: /tmp/f1-5906/bgpd.c:5252:
< ERROR: code indent should use tabs where possible
< #5253: FILE: /tmp/f1-5906/bgpd.c:5253:
< WARNING: please, no spaces at the start of a line
< #5253: FILE: /tmp/f1-5906/bgpd.c:5253:
< WARNING: line over 80 characters
< #5960: FILE: /tmp/f1-5906/bgpd.c:5960:

Warnings Generated during build:

Debian 10 amd64 build: Successful with additional warnings

Debian Package lintian failed for Debian 10 amd64 build:
(see full package build log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-15166/artifact/DEB10BUILD/ErrorLog/log_lintian.txt)

W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr-snmp: changelog-file-missing-explicit-entry 6.0-2 -> 7.6-dev-20201104-00-ge2b410016-0 (missing) -> 7.6-dev-20201104-00-ge2b410016-0~deb10u1
W: frr-pythontools: changelog-file-missing-explicit-entry 6.0-2 -> 7.6-dev-20201104-00-ge2b410016-0 (missing) -> 7.6-dev-20201104-00-ge2b410016-0~deb10u1
W: frr-rpki-rtrlib: changelog-file-missing-explicit-entry 6.0-2 -> 7.6-dev-20201104-00-ge2b410016-0 (missing) -> 7.6-dev-20201104-00-ge2b410016-0~deb10u1
W: frr: changelog-file-missing-explicit-entry 6.0-2 -> 7.6-dev-20201104-00-ge2b410016-0 (missing) -> 7.6-dev-20201104-00-ge2b410016-0~deb10u1
W: frr-doc: changelog-file-missing-explicit-entry 6.0-2 -> 7.6-dev-20201104-00-ge2b410016-0 (missing) -> 7.6-dev-20201104-00-ge2b410016-0~deb10u1

CLANG Static Analyzer Summary

  • Github Pull Request 7449, comparing to Git base SHA dc7b85a

No Changes in Static Analysis warnings compared to base

3 Static Analyzer issues remaining.

See details at
https://ci1.netdef.org/browse/FRR-FRRPULLREQ-15166/artifact/shared/static_analysis/index.html

Copy link
Member

@ton31337 ton31337 left a comment

Choose a reason for hiding this comment

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

Please use clang-formater first.

@sudhanshukumar22
Copy link
Contributor Author

Please use clang-formater first.

Hi,
Our git here does not support --clang-format option. Is there any git plugin which I can install to support clang-format ?

@ton31337
Copy link
Member

What do you mean "Our git here"?

@Spantik
Copy link
Member

Spantik commented Nov 16, 2020

While the changes looks good formating is still not ok.

@Spantik
Copy link
Member

Spantik commented Nov 16, 2020

@sudhanshukumar22 sudhanshukumar22 changed the title bgpd: config connect timer is not applied immediately for peers in no… bgpd: config connect timer not applied immediately for non-established peers. Jan 25, 2021
@sudhanshukumar22
Copy link
Contributor Author

@sudhanshukumar22
Copy link
Contributor Author

Please use clang-formater first.

Done

@LabN-CI
Copy link
Collaborator

LabN-CI commented Jan 25, 2021

Outdated results 💚

Basic BGPD CI results: SUCCESS, 0 tests failed

_ _
Result SUCCESS git merge/7449 29011c3
Date 01/25/2021
Start 08:45:39
Finish 09:24:55
Run-Time 39:16
Total 1815
Pass 1815
Fail 0
Valgrind-Errors 0
Valgrind-Loss 0
Details vncregress-2021-01-25-08:45:39.txt
Log autoscript-2021-01-25-08:46:42.log.bz2
Memory 499 500 427

For details, please contact louberger

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Jan 25, 2021

Continuous Integration Result: SUCCESSFUL

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-16676/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Debian 10 amd64 build: Successful with additional warnings

Debian Package lintian failed for Debian 10 amd64 build:
(see full package build log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-16676/artifact/DEB10BUILD/ErrorLog/log_lintian.txt)

W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr-doc: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210125-04-g29011c39f-0 (missing) -> 7.6-dev-20210125-04-g29011c39f-0~deb10u1
W: frr-snmp: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210125-04-g29011c39f-0 (missing) -> 7.6-dev-20210125-04-g29011c39f-0~deb10u1
W: frr-pythontools: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210125-04-g29011c39f-0 (missing) -> 7.6-dev-20210125-04-g29011c39f-0~deb10u1
W: frr-rpki-rtrlib: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210125-04-g29011c39f-0 (missing) -> 7.6-dev-20210125-04-g29011c39f-0~deb10u1
W: frr: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210125-04-g29011c39f-0 (missing) -> 7.6-dev-20210125-04-g29011c39f-0~deb10u1

@sudhanshukumar22
Copy link
Contributor Author

Please use clang-formater first.

@ton31337 ,The changes are done. Please review the changes.

bgpd/bgpd.c Outdated Show resolved Hide resolved
@sudhanshukumar22 sudhanshukumar22 force-pushed the bgp-update-connect-timer branch 2 times, most recently from 4265dc2 to b090bfd Compare February 1, 2021 16:46
@LabN-CI
Copy link
Collaborator

LabN-CI commented Feb 1, 2021

Outdated results 💚

Basic BGPD CI results: SUCCESS, 0 tests failed

_ _
Result SUCCESS git merge/7449 b090bfd
Date 02/01/2021
Start 13:44:47
Finish 14:24:11
Run-Time 39:24
Total 1815
Pass 1815
Fail 0
Valgrind-Errors 0
Valgrind-Loss 0
Details vncregress-2021-02-01-13:44:47.txt
Log autoscript-2021-02-01-13:45:53.log.bz2
Memory 506 503 428

For details, please contact louberger

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Feb 1, 2021

Continuous Integration Result: SUCCESSFUL

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-16868/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Debian 10 amd64 build: Successful with additional warnings

Debian Package lintian failed for Debian 10 amd64 build:
(see full package build log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-16868/artifact/DEB10BUILD/ErrorLog/log_lintian.txt)

W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr-snmp: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210201-00-g4265dc2a3-0 (missing) -> 7.6-dev-20210201-00-g4265dc2a3-0~deb10u1
W: frr-rpki-rtrlib: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210201-00-g4265dc2a3-0 (missing) -> 7.6-dev-20210201-00-g4265dc2a3-0~deb10u1
W: frr-pythontools: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210201-00-g4265dc2a3-0 (missing) -> 7.6-dev-20210201-00-g4265dc2a3-0~deb10u1
W: frr: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210201-00-g4265dc2a3-0 (missing) -> 7.6-dev-20210201-00-g4265dc2a3-0~deb10u1
W: frr-doc: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210201-00-g4265dc2a3-0 (missing) -> 7.6-dev-20210201-00-g4265dc2a3-0~deb10u1

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Feb 1, 2021

Continuous Integration Result: SUCCESSFUL

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-16869/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Debian 10 amd64 build: Successful with additional warnings

Debian Package lintian failed for Debian 10 amd64 build:
(see full package build log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-16869/artifact/DEB10BUILD/ErrorLog/log_lintian.txt)

W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr-snmp: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210201-00-gb090bfd58-0 (missing) -> 7.6-dev-20210201-00-gb090bfd58-0~deb10u1
W: frr-rpki-rtrlib: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210201-00-gb090bfd58-0 (missing) -> 7.6-dev-20210201-00-gb090bfd58-0~deb10u1
W: frr-doc: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210201-00-gb090bfd58-0 (missing) -> 7.6-dev-20210201-00-gb090bfd58-0~deb10u1
W: frr: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210201-00-gb090bfd58-0 (missing) -> 7.6-dev-20210201-00-gb090bfd58-0~deb10u1
W: frr-pythontools: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210201-00-gb090bfd58-0 (missing) -> 7.6-dev-20210201-00-gb090bfd58-0~deb10u1

bgpd/bgpd.c Outdated Show resolved Hide resolved
Copy link

@polychaeta polychaeta left a comment

Choose a reason for hiding this comment

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

Thanks for your contribution to FRR!

Click for style suggestions

To apply these suggestions:

curl -s https://gist.githubusercontent.com/polychaeta/09181166485208d1eed9e97d390bb1fb/raw/9e95998cd301218e2887973cd3f4135223c8751e/cr_7449_1612261404.diff | git apply

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 30b538220..50086315c 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -5305,8 +5305,7 @@ int peer_timers_connect_set(struct peer *peer, uint32_t connect)
 	peer->v_connect = connect;
 
 	/* Skip peer-group mechanics for regular peers. */
-	if (!CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP))
-	{
+	if (!CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP)) {
 		if (peer->status != Established) {
 			if (peer_active(peer))
 				BGP_EVENT_ADD(peer, BGP_Stop);
@@ -5360,8 +5359,7 @@ int peer_timers_connect_unset(struct peer *peer)
 		peer->v_connect = peer->bgp->default_connect_retry;
 
 	/* Skip peer-group mechanics for regular peers. */
-	if (!CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP))
-	{
+	if (!CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP)) {
 		if (peer->status != Established) {
 			if (peer_active(peer))
 				BGP_EVENT_ADD(peer, BGP_Stop);

If you are a new contributor to FRR, please see our contributing guidelines.

After making changes, you do not need to create a new PR. You should perform an amend or interactive rebase followed by a force push.

…n-established state.

Description:
When user is config connect timer, it doesn't reflect
immediately. It reflect when next time neighbor is tried to reconnect.

Problem Description/Summary :
When user is config connect timer, it doesn't reflect
The network connection was aborted by the local system.d to reconnect.
Fix is to update the connect timer immediately if BGP
    session is not in establish state.

Expected Behavior :
If neighbor is not yet established, we should immediately apply the config connect timer to the peer.

Signed-off-by: sudhanshukumar22 <sudhanshu.kumar@broadcom.com>
Copy link
Member

@ton31337 ton31337 left a comment

Choose a reason for hiding this comment

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

LGTM now.

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Feb 2, 2021

Continuous Integration Result: SUCCESSFUL

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-16890/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Debian 10 amd64 build: Successful with additional warnings

Debian Package lintian failed for Debian 10 amd64 build:
(see full package build log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-16890/artifact/DEB10BUILD/ErrorLog/log_lintian.txt)

W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr-rpki-rtrlib: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210202-00-g91de6fa22-0 (missing) -> 7.6-dev-20210202-00-g91de6fa22-0~deb10u1
W: frr: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210202-00-g91de6fa22-0 (missing) -> 7.6-dev-20210202-00-g91de6fa22-0~deb10u1
W: frr-pythontools: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210202-00-g91de6fa22-0 (missing) -> 7.6-dev-20210202-00-g91de6fa22-0~deb10u1
W: frr-snmp: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210202-00-g91de6fa22-0 (missing) -> 7.6-dev-20210202-00-g91de6fa22-0~deb10u1
W: frr-doc: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210202-00-g91de6fa22-0 (missing) -> 7.6-dev-20210202-00-g91de6fa22-0~deb10u1

@LabN-CI
Copy link
Collaborator

LabN-CI commented Feb 2, 2021

💚 Basic BGPD CI results: SUCCESS, 0 tests failed

Results table
_ _
Result SUCCESS git merge/7449 91de6fa
Date 02/02/2021
Start 07:59:58
Finish 08:39:16
Run-Time 39:18
Total 1815
Pass 1815
Fail 0
Valgrind-Errors 0
Valgrind-Loss 0
Details vncregress-2021-02-02-07:59:58.txt
Log autoscript-2021-02-02-08:01:04.log.bz2
Memory 500 512 427

For details, please contact louberger

@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-16889/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Checkout code: Successful with additional warnings
Report for bgpd.c | 4 issues
===============================================
< ERROR: that open brace { should be on the previous line
< #5308: FILE: /tmp/f1-7579/bgpd.c:5308:
< ERROR: that open brace { should be on the previous line
< #5363: FILE: /tmp/f1-7579/bgpd.c:5363:

Warnings Generated during build:

Debian 10 amd64 build: Successful with additional warnings

Debian Package lintian failed for Debian 10 amd64 build:
(see full package build log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-16889/artifact/DEB10BUILD/ErrorLog/log_lintian.txt)

W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr-rpki-rtrlib: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210202-00-g2030b8132-0 (missing) -> 7.6-dev-20210202-00-g2030b8132-0~deb10u1
W: frr-doc: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210202-00-g2030b8132-0 (missing) -> 7.6-dev-20210202-00-g2030b8132-0~deb10u1
W: frr-pythontools: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210202-00-g2030b8132-0 (missing) -> 7.6-dev-20210202-00-g2030b8132-0~deb10u1
W: frr-snmp: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210202-00-g2030b8132-0 (missing) -> 7.6-dev-20210202-00-g2030b8132-0~deb10u1
W: frr: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210202-00-g2030b8132-0 (missing) -> 7.6-dev-20210202-00-g2030b8132-0~deb10u1

@ton31337 ton31337 merged commit fe7bc99 into FRRouting:master Feb 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants