On Thu, Jan 20, 2022 at 11:06:20AM -0700, Claudio Jeker wrote: > CVSROOT: /cvs > Module name: src > Changes by: [email protected] 2022/01/20 11:06:20 > > Modified files: > usr.sbin/bgpd : bgpd.c rde.c rtr.c session.c > > Log message: > Make sure that all poll loops properly restart the poll loop on EINTR. > Also either fail hard or restart after other errors. In anycase do not > look at pollfds after an error. > OK benno@
This commit broke the following regress test: > usr.sbin/bgpd: Exit: 1 Duration: 00:01:53 Log: 230-usr.sbin-bgpd.log ==== mrt ==== doas -n ksh /home/src/regress/usr.sbin/bgpd/integrationtests/mrt.sh /usr/sbin/bgpd /home/src/regress/usr.sbin/bgpd/integrationtests 11 check if rdomains are busy + echo setup setup + ifconfig mpe11 rdomain 11 mplslabel 42 + ifconfig lo11 inet 127.0.0.1/8 + route -T 11 exec /usr/sbin/bgpd -v -f /home/src/regress/usr.sbin/bgpd/integrationtests/bgpd.mrt.conf + sleep 2 + pkill -USR1 -T 11 -u 0 bgpd + sleep 2 + echo test table-v2 test table-v2 + bgpctl show mrt detail file mrt-table-v2.mrt + tee mrt-table-v2.out + grep -v Last update: + diff -u /home/src/regress/usr.sbin/bgpd/integrationtests/mrt-table-v2.ok mrt-table-v2.out --- /home/src/regress/usr.sbin/bgpd/integrationtests/mrt-table-v2.ok Fri Jun 28 07:48:07 2019 +++ mrt-table-v2.out Sun Jan 23 05:51:20 2022 @@ -1,68 +0,0 @@ - -BGP routing table entry for 192.0.2.0/24 - 4200000001 4200000001 4200000001 4200000001 4200000001 - Nexthop 1.2.3.4 (via 1.2.3.4) Neighbor 0.0.0.0 (42.0.0.1) - Origin EGP, metric 42, localpref 15, weight 0, ovs not-found, external - -BGP routing table entry for 198.51.100.0/24 - Nexthop 0.0.0.0 (via 0.0.0.0) Neighbor 0.0.0.0 (42.0.0.1) - Origin IGP, metric 0, localpref 100, weight 0, ovs not-found, external - Communities: 42:1 GRACEFUL_SHUTDOWN - Ext. Communities: ovs invalid rt 127.0.0.1:15 - Large Communities: 4200000001:2:4200000001 4200000001:42:1 - -BGP routing table entry for 203.0.113.0/24 - Nexthop 0.0.0.0 (via 0.0.0.0) Neighbor 0.0.0.0 (42.0.0.1) - Origin IGP, metric 0, localpref 100, weight 0, ovs not-found, external - -BGP routing table entry for 2001:db8:1::/48 - 4200000001 4200000001 4200000001 4200000001 4200000001 - Nexthop 2001:db8:42::1 (via 2001:db8:42::1) Neighbor 0.0.0.0 (42.0.0.1) - Origin EGP, metric 42, localpref 15, weight 0, ovs not-found, external - -BGP routing table entry for 2001:db8:2::/48 - Nexthop :: (via ::) Neighbor 0.0.0.0 (42.0.0.1) - Origin IGP, metric 0, localpref 100, weight 0, ovs not-found, external - Communities: 42:1 GRACEFUL_SHUTDOWN - Ext. Communities: ovs invalid rt 127.0.0.1:15 - Large Communities: 4200000001:2:4200000001 4200000001:42:1 - -BGP routing table entry for 2001:db8:3::/48 - Nexthop :: (via ::) Neighbor 0.0.0.0 (42.0.0.1) - Origin IGP, metric 0, localpref 100, weight 0, ovs not-found, external - -BGP routing table entry for rd 4200000001:1 192.0.2.0/24 - 4200000001 4200000001 4200000001 4200000001 4200000001 - Nexthop rd 0:0 0.0.0.0 (via rd 0:0 0.0.0.0) Neighbor 0.0.0.0 (42.0.0.1) - Origin EGP, metric 42, localpref 15, weight 0, ovs not-found, external - Ext. Communities: rt 4200000001:42 - -BGP routing table entry for rd 4200000001:1 198.51.100.0/24 - Nexthop rd 0:0 0.0.0.0 (via rd 0:0 0.0.0.0) Neighbor 0.0.0.0 (42.0.0.1) - Origin IGP, metric 0, localpref 100, weight 0, ovs not-found, external - Communities: 42:1 GRACEFUL_SHUTDOWN - Ext. Communities: ovs invalid rt 127.0.0.1:15 rt 4200000001:42 - Large Communities: 4200000001:2:42 4200000001:42:1 - -BGP routing table entry for rd 4200000001:1 203.0.113.0/24 - Nexthop rd 0:0 0.0.0.0 (via rd 0:0 0.0.0.0) Neighbor 0.0.0.0 (42.0.0.1) - Origin IGP, metric 0, localpref 100, weight 0, ovs not-found, external - Ext. Communities: rt 4200000001:42 - -BGP routing table entry for rd 4200000001:1 2001:db8:1::/48 - 4200000001 4200000001 4200000001 4200000001 4200000001 - Nexthop rd 0:0 :: (via rd 0:0 ::) Neighbor 0.0.0.0 (42.0.0.1) - Origin EGP, metric 42, localpref 15, weight 0, ovs not-found, external - Ext. Communities: rt 4200000001:42 - -BGP routing table entry for rd 4200000001:1 2001:db8:2::/48 - Nexthop rd 0:0 :: (via rd 0:0 ::) Neighbor 0.0.0.0 (42.0.0.1) - Origin IGP, metric 0, localpref 100, weight 0, ovs not-found, external - Communities: 42:1 GRACEFUL_SHUTDOWN - Ext. Communities: ovs invalid rt 127.0.0.1:15 rt 4200000001:42 - Large Communities: 4200000001:2:42 4200000001:42:1 - -BGP routing table entry for rd 4200000001:1 2001:db8:3::/48 - Nexthop rd 0:0 :: (via rd 0:0 ::) Neighbor 0.0.0.0 (42.0.0.1) - Origin IGP, metric 0, localpref 100, weight 0, ovs not-found, external - Ext. Communities: rt 4200000001:42 + error_notify 1 FAILED *** Error 1 in integrationtests (Makefile:23 'mrt') FAILED
