shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-08 08:58:27 +03:00
Code

Merge pull request #31172 from yuwata/network-bond-port

Browse Source 
network: do not bring down bonding port on reconfigure
This commit is contained in:
Yu Watanabe 2024-02-09 17:32:29 +09:00 committed by GitHub
commit 9e95c0e495
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/network/networkd-setlink.c
View File

@ -486,7 +486,7 @@ static int link_is_ready_to_set_link(Link *link, Request *req) {
return link->bridge_vlan_set;
case REQUEST_TYPE_SET_LINK_CAN:
/* Do not check link->set_flgas_messages here, as it is ok even if link->flags
/* Do not check link->set_flags_messages here, as it is ok even if link->flags
* is outdated, and checking the counter causes a deadlock. */
if (FLAGS_SET(link->flags, IFF_UP)) {
/* The CAN interface must be down to configure bitrate, etc... */
@ -532,15 +532,6 @@ static int link_is_ready_to_set_link(Link *link, Request *req) {
if (!netdev_is_ready(link->network->bond))
return false;
m = link->network->bond->ifindex;
/* Do not check link->set_flgas_messages here, as it is ok even if link->flags
* is outdated, and checking the counter causes a deadlock. */
if (FLAGS_SET(link->flags, IFF_UP)) {
/* link must be down when joining to bond master. */
r = link_down_now(link);
if (r < 0)
return r;
}
} else if (link->network->bridge) {
if (ordered_set_contains(link->manager->request_queue, &req_mac))
return false;
@ -559,6 +550,15 @@ static int link_is_ready_to_set_link(Link *link, Request *req) {
return -EALREADY; /* indicate to cancel the request. */
}
/* Do not check link->set_flags_messages here, as it is ok even if link->flags is outdated,
* and checking the counter causes a deadlock. */
if (link->network->bond && FLAGS_SET(link->flags, IFF_UP)) {
/* link must be down when joining to bond master. */
r = link_down_now(link);
if (r < 0)
return r;
}
req->userdata = UINT32_TO_PTR(m);
break;
}
@ -1046,6 +1046,8 @@ static int link_up_or_down(Link *link, bool up, Request *req) {
assert(link->manager->rtnl);
assert(req);
/* The log message is checked in the test. Please also update test_bond_active_slave() in
* test/test-network/systemd-networkd-tests.py. when the log message below is modified. */
log_link_debug(link, "Bringing link %s", up_or_down(up));
r = sd_rtnl_message_new_link(link->manager->rtnl, &m, RTM_SETLINK, link->ifindex);

6
test/test-network/systemd-networkd-tests.py
View File

@ -4593,6 +4593,12 @@ class NetworkdBondTests(unittest.TestCase, Utilities):
print(output)
self.assertIn('active_slave dummy98', output)
# test case for issue #31165.
since = datetime.datetime.now()
networkctl_reconfigure('dummy98')
self.wait_online(['dummy98:enslaved', 'bond199:degraded'])
self.assertNotIn('dummy98: Bringing link down', read_networkd_log(since=since))
def test_bond_primary_slave(self):
copy_network_unit('23-primary-slave.network', '23-bond199.network', '25-bond-active-backup-slave.netdev', '12-dummy.netdev')
start_networkd()