Skip to content

Commit 4db0e09

Browse files
committed
tests/crio: Override ridiculously low default crio grpc timeouts
We should probably bump the timeouts here upstream too; DBus uses 30s by default which seems much more reasonable. Closes: openshift/os#818
1 parent 0890f5f commit 4db0e09

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

mantle/kola/tests/crio/crio.go

+17-8
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ type simplifiedCrioInfo struct {
4040
CgroupDriver string `json:"cgroup_driver"`
4141
}
4242

43+
// overrideCrioOperationTimeoutSeconds replaces the currently *extremely* low
44+
// default crio operation timeouts that cause flakes in our CI.
45+
// See https://github.com/openshift/os/issues/818
46+
const overrideCrioOperationTimeoutSeconds = "300s"
47+
4348
// crioPodTemplate is a simple string template required for creating a pod in crio
4449
// It takes two strings: the name (which will be expanded) and the generated image name
4550
var crioPodTemplate = `{
@@ -283,12 +288,13 @@ func crioNetwork(c cluster.TestCluster) {
283288
}
284289

285290
listener := func(ctx context.Context) error {
286-
podID, err := c.SSHf(dest, "sudo crictl runp %s", crioConfigPod)
291+
podID, err := c.SSHf(dest, "sudo crictl runp -T %s %s", overrideCrioOperationTimeoutSeconds, crioConfigPod)
287292
if err != nil {
288293
return err
289294
}
290295

291-
containerID, err := c.SSHf(dest, "sudo crictl create --no-pull %s %s %s",
296+
containerID, err := c.SSHf(dest, "sudo crictl create -T %s --no-pull %s %s %s",
297+
overrideCrioOperationTimeoutSeconds,
292298
podID, crioConfigContainer, crioConfigPod)
293299
if err != nil {
294300
return err
@@ -326,12 +332,13 @@ func crioNetwork(c cluster.TestCluster) {
326332
time.Sleep(100 * time.Millisecond)
327333
}
328334
}
329-
podID, err := c.SSHf(src, "sudo crictl runp %s", crioConfigPod)
335+
podID, err := c.SSHf(src, "sudo crictl runp -T %s %s", overrideCrioOperationTimeoutSeconds, crioConfigPod)
330336
if err != nil {
331337
return err
332338
}
333339

334-
containerID, err := c.SSHf(src, "sudo crictl create --no-pull %s %s %s",
340+
containerID, err := c.SSHf(src, "sudo crictl create -T %s --no-pull %s %s %s",
341+
overrideCrioOperationTimeoutSeconds,
335342
podID, crioConfigContainer, crioConfigPod)
336343
if err != nil {
337344
return err
@@ -379,9 +386,10 @@ func crioNetworksReliably(c cluster.TestCluster) {
379386
c.Fatal(err)
380387
}
381388

382-
cmdCreatePod := fmt.Sprintf("sudo crictl runp %s", crioConfigPod)
389+
cmdCreatePod := fmt.Sprintf("sudo crictl runp -T %s %s", overrideCrioOperationTimeoutSeconds, crioConfigPod)
383390
podID := c.MustSSH(m, cmdCreatePod)
384-
containerID := c.MustSSH(m, fmt.Sprintf("sudo crictl create --no-pull %s %s %s",
391+
containerID := c.MustSSH(m, fmt.Sprintf("sudo crictl create -T %s --no-pull %s %s %s",
392+
overrideCrioOperationTimeoutSeconds,
385393
podID, crioConfigContainer, crioConfigPod))
386394
output = output + string(c.MustSSH(m, fmt.Sprintf("sudo crictl exec %s ping -i 0.2 %s -w 1 >/dev/null && echo PASS || echo FAIL", containerID, hostIP)))
387395
}
@@ -441,9 +449,10 @@ func crioPodContinuesDuringServiceRestart(c cluster.TestCluster) {
441449
if err != nil {
442450
c.Fatal(err)
443451
}
444-
cmdCreatePod := fmt.Sprintf("sudo crictl runp %s", crioConfigPod)
452+
cmdCreatePod := fmt.Sprintf("sudo crictl runp -T %s %s", overrideCrioOperationTimeoutSeconds, crioConfigPod)
445453
podID := c.MustSSH(m, cmdCreatePod)
446-
containerID := c.MustSSH(m, fmt.Sprintf("sudo crictl create --no-pull %s %s %s",
454+
containerID := c.MustSSH(m, fmt.Sprintf("sudo crictl create -T %s --no-pull %s %s %s",
455+
overrideCrioOperationTimeoutSeconds,
447456
podID, crioConfigContainer, crioConfigPod))
448457

449458
cmd := fmt.Sprintf("sudo crictl exec %s bash -c \"sleep 25 && echo PASS > /tmp/test/restart-test\"", containerID)

0 commit comments

Comments
 (0)