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.

Sign up for GitHub

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

Jump to bottom

ovs: disable StartLimitBurst in the ovs-cleanup service (LP: #2047827) #431

Merged
merged 1 commit into from
Jan 8, 2024
Merged

ovs: disable StartLimitBurst in the ovs-cleanup service (LP: #2047827) #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/openvswitch.c
View file
Open in desktop
Expand Up @@ -60,6 +60,11 @@ write_ovs_systemd_unit(const char* id, const GString* cmds, const char* rootdir,
}

g_string_append(s, "\n[Service]\nType=oneshot\nTimeoutStartSec=10s\n");
/* During tests the rate in which the netplan-ovs-cleanup service is started/stopped
* might exceed StartLimitBurst.
*/
if (cleanup)
g_string_append(s, "StartLimitBurst=0\n");
g_string_append(s, cmds->str);

g_string_free_to_file(s, rootdir, path, NULL);
Expand Down
2 changes: 1 addition & 1 deletion tests/generator/base.py
View file
Open in desktop
Expand Up @@ -70,7 +70,7 @@
OVS_BR_EMPTY = _OVS_BASE + 'After=netplan-ovs-cleanup.service\nBefore=network.target\nWants=network.target\n\n[Service]\n\
Type=oneshot\nTimeoutStartSec=10s\nExecStart=/usr/bin/ovs-vsctl --may-exist add-br %(iface)s\n' + OVS_BR_DEFAULT
OVS_CLEANUP = _OVS_BASE + 'ConditionFileIsExecutable=/usr/bin/ovs-vsctl\nBefore=network.target\nWants=network.target\n\n\
[Service]\nType=oneshot\nTimeoutStartSec=10s\nExecStart=/usr/sbin/netplan apply --only-ovs-cleanup\n'
[Service]\nType=oneshot\nTimeoutStartSec=10s\nStartLimitBurst=0\nExecStart=/usr/sbin/netplan apply --only-ovs-cleanup\n'
UDEV_MAC_RULE = 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="%s", ATTR{address}=="%s", NAME="%s"\n'
UDEV_NO_MAC_RULE = 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="%s", NAME="%s"\n'
UDEV_SRIOV_RULE = 'ACTION=="add", SUBSYSTEM=="net", ATTRS{sriov_totalvfs}=="?*", RUN+="/usr/sbin/netplan apply --sriov-only"\n'
Expand Down