From cd46e941b2c18d61a0022ae6f7d52fe763a91a76 Mon Sep 17 00:00:00 2001 From: William Zhao Date: Thu, 9 Mar 2023 15:05:32 -0500 Subject: [PATCH] Add the no-wait argument to ovs-vsctl commands for hw-offload The "no-wait" argument is needed for ovs-vsctl commands because there is a chance for ovs-vsctl to timeout. Adding "--no-wait" to the command line would make it such that ovs-vsctl doesn't wait for ovs-vswitchd to update "cur_cfg" An example of this timeout is shown here: ovs-vsctl[3265]: ovs|00001|vsctl|INFO|Called as /bin/ovs-vsctl set Open_vSwitch . other_config:hw-offload=true systemd[1]: ovs-vswitchd.service: start-pre operation timed out. Terminating. ovs-vsctl[3265]: 2023-02-22T22:00:20Z|00002|fatal_signal|WARN|terminating with signal 15 (Terminated) ovs-vsctl[3265]: ovs|00002|fatal_signal|WARN|terminating with signal 15 (Terminated) systemd[1]: ovs-vswitchd.service: Failed with result 'timeout'. systemd[1]: Failed to start Open vSwitch Forwarding Unit. --- .../switchdev-config/ovs-units/ovs-vswitchd.service.yaml | 2 +- .../testdata/machineconfig/units/ovs-vswitchd.service.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bindata/manifests/switchdev-config/ovs-units/ovs-vswitchd.service.yaml b/bindata/manifests/switchdev-config/ovs-units/ovs-vswitchd.service.yaml index 8174f1d69..66d7efed1 100644 --- a/bindata/manifests/switchdev-config/ovs-units/ovs-vswitchd.service.yaml +++ b/bindata/manifests/switchdev-config/ovs-units/ovs-vswitchd.service.yaml @@ -3,4 +3,4 @@ dropins: - name: 10-hw-offload.conf contents: | [Service] - ExecStartPre=/bin/ovs-vsctl set Open_vSwitch . other_config:hw-offload=true + ExecStartPre=/bin/ovs-vsctl --no-wait set Open_vSwitch . other_config:hw-offload=true diff --git a/pkg/render/testdata/machineconfig/units/ovs-vswitchd.service.yaml b/pkg/render/testdata/machineconfig/units/ovs-vswitchd.service.yaml index 8174f1d69..66d7efed1 100644 --- a/pkg/render/testdata/machineconfig/units/ovs-vswitchd.service.yaml +++ b/pkg/render/testdata/machineconfig/units/ovs-vswitchd.service.yaml @@ -3,4 +3,4 @@ dropins: - name: 10-hw-offload.conf contents: | [Service] - ExecStartPre=/bin/ovs-vsctl set Open_vSwitch . other_config:hw-offload=true + ExecStartPre=/bin/ovs-vsctl --no-wait set Open_vSwitch . other_config:hw-offload=true