Use correct timer to restart in BgpXmppChannel::EndOfRibSendTimerExpired()

Bug #1643058 reported by Ananth Suryanarayana
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Juniper Openstack
Status tracked in Trunk
R3.2
Fix Committed
Low
Ananth Suryanarayana
Trunk
Fix Committed
Low
Ananth Suryanarayana

Bug Description

Due to a typo (or copy-paste), receiver timer is used in send eor function.

diff --git a/src/bgp/bgp_xmpp_channel.cc b/src/bgp/bgp_xmpp_channel.cc
index eb80494..1514af0 100644
--- a/src/bgp/bgp_xmpp_channel.cc
+++ b/src/bgp/bgp_xmpp_channel.cc
@@ -2223,7 +2223,7 @@ bool BgpXmppChannel::EndOfRibSendTimerExpired() {
         // seconds, delay EoR send event.
         if (channel_->LastReceived(kEndOfRibSendRetryTimeMsecs * 3) ||
                 channel_->LastSent(kEndOfRibSendRetryTimeMsecs * 3)) {
- eor_receive_timer_->Reschedule(kEndOfRibSendRetryTimeMsecs);
+ eor_send_timer_->Reschedule(kEndOfRibSendRetryTimeMsecs);
             BGP_LOG_PEER(Message, Peer(), SandeshLevel::SYS_INFO,
                          BGP_LOG_FLAG_ALL, BGP_PEER_DIR_IN,
                          "EndOfRib Send timer rescheduled to fire after " <<
@@ -2251,7 +2251,7 @@ void BgpXmppChannel::StartEndOfRibReceiveTimer() {
         boost::bind(&BgpXmppChannel::EndOfRibTimerErrorHandler, this, _1, _2));
 }

Revision history for this message
OpenContrail Admin (ci-admin-f) wrote : [Review update] R3.2

Review in progress for https://review.opencontrail.org/26281
Submitter: Ananth Suryanarayana (<email address hidden>)

Revision history for this message
OpenContrail Admin (ci-admin-f) wrote : [Review update] master

Review in progress for https://review.opencontrail.org/26282
Submitter: Ananth Suryanarayana (<email address hidden>)

Revision history for this message
OpenContrail Admin (ci-admin-f) wrote : A change has been merged

Reviewed: https://review.opencontrail.org/26281
Committed: http://github.org/Juniper/contrail-controller/commit/dd25624f0dc2d42d8b78693f419a3017a4e83b8a
Submitter: Zuul
Branch: R3.2

commit dd25624f0dc2d42d8b78693f419a3017a4e83b8a
Author: Ananth Suryanarayana <email address hidden>
Date: Fri Nov 18 12:43:58 2016 -0800

Use correct timer to reschedule in BgpXmppChannel::EndOfRibSendTimerExpired()

Also rename BgpXmppChannel::ResetEndOfRibState() to ResetEndOfRibSendState()

Change-Id: I0e4005c80ae5eb9cf7202a78d0817bd9c69f64d9
Closes-Bug: #1643058

Revision history for this message
OpenContrail Admin (ci-admin-f) wrote :

Reviewed: https://review.opencontrail.org/26282
Committed: http://github.org/Juniper/contrail-controller/commit/592613a6874a9504c0b8edc9c95086fdd87fea6f
Submitter: Zuul
Branch: master

commit 592613a6874a9504c0b8edc9c95086fdd87fea6f
Author: Ananth Suryanarayana <email address hidden>
Date: Fri Nov 18 12:43:58 2016 -0800

Use correct timer to reschedule in BgpXmppChannel::EndOfRibSendTimerExpired()

Also rename BgpXmppChannel::ResetEndOfRibState() to ResetEndOfRibSendState()

Change-Id: I0e4005c80ae5eb9cf7202a78d0817bd9c69f64d9
Closes-Bug: #1643058

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.