fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-06 16:40:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform/tests: workaround failure to add veth device on copr

Browse source 
On copr builds, the unit tests sometimes fail to create a veth
interface. In those cases, kernel rejects the netlink request
with EPERM. copr uses mock on Fedora 33 hosts.

I think this is a kernel bug. Add a workaround by retrying a few times.
This commit is contained in:
Thomas Haller 2021-01-07 21:27:01 +01:00
parent 5e70e802e0
commit 02f4b0cbd5
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/platform/tests/test-common.c
View file

@ -1572,8 +1572,8 @@ nmtstp_link_veth_add(NMPlatform *platform,
const char *name,
const char *peer)
{
const NMPlatformLink *pllink = NULL;
gboolean success;
const NMPlatformLink *pllink = NULL;
gboolean success = FALSE;
g_assert(nm_utils_ifname_valid_kernel(name, NULL));
@ -1586,9 +1586,28 @@ nmtstp_link_veth_add(NMPlatform *platform,
if (success) {
pllink = nmtstp_assert_wait_for_link(platform, name, NM_LINK_TYPE_VETH, 100);
nmtstp_assert_wait_for_link(platform, peer, NM_LINK_TYPE_VETH, 10);
} else {
/* iproute2 might fail in copr. See below.
* We accept that and try our platform implementation instead. */
_LOGI("iproute2 failed to add veth device. Retry with platform code.");
external_command = FALSE;
}
} else
success = NMTST_NM_ERR_SUCCESS(nm_platform_link_veth_add(platform, name, peer, &pllink));
}
if (!external_command) {
int try_count = 0;
int r;
again:
r = nm_platform_link_veth_add(platform, name, peer, &pllink);
if (r == -EPERM && try_count++ < 5) {
/* in copr (mock with Fedora 33 builders), this randomly fails with EPERM.
* Very odd. Try to work around by retrying. */
_LOGI("netlink failuer EPERM to add veth device. Retry.");
goto again;
}
success = NMTST_NM_ERR_SUCCESS(r);
}
g_assert(success);
_assert_pllink(platform, success, pllink, name, NM_LINK_TYPE_VETH);