From 7f8348bc7823ffa097a8bc21fa1296ddc8bfe4fe Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 18 Jul 2022 16:29:25 -0400
Subject: [PATCH] Greatly raise `StartLimitBurst` for `rpm-ostreed.service`

This is a hack to work around the lack of
https://github.com/coreos/rpm-ostree/pull/3523/commits/0556152adb14a8e1cdf6c5d6f234aacbe8dd4e3f
for RHEL 8.6 and below.

A recent PR in the MCO https://github.com/openshift/machine-config-operator/pull/3243
tipped things over the edge and we now see failures a lot more often.
---
 common.yaml                                                  | 1 +
 .../lib/systemd/system/rpm-ostreed.service.d/startlimit.conf | 4 ++++
 tests/kola/rpm-ostree/startlimit.sh                          | 5 +++++
 3 files changed, 10 insertions(+)
 create mode 100644 overlay.d/15rhcos-rhel8-workarounds/usr/lib/systemd/system/rpm-ostreed.service.d/startlimit.conf
 create mode 100644 tests/kola/rpm-ostree/startlimit.sh

diff --git a/common.yaml b/common.yaml
index c59c7fd71..49cdb606f 100644
--- a/common.yaml
+++ b/common.yaml
@@ -16,6 +16,7 @@ ostree-layers:
   - overlay/05rhcos
   - overlay/06gcp-routes
   - overlay/15rhcos-tuned-bits
+  - overlay/15rhcos-rhel8-workarounds  # TODO conditionalize on rhel8
   - overlay/20platform-chrony
   - overlay/21dhcp-chrony
 
diff --git a/overlay.d/15rhcos-rhel8-workarounds/usr/lib/systemd/system/rpm-ostreed.service.d/startlimit.conf b/overlay.d/15rhcos-rhel8-workarounds/usr/lib/systemd/system/rpm-ostreed.service.d/startlimit.conf
new file mode 100644
index 000000000..843e5c4b8
--- /dev/null
+++ b/overlay.d/15rhcos-rhel8-workarounds/usr/lib/systemd/system/rpm-ostreed.service.d/startlimit.conf
@@ -0,0 +1,4 @@
+[Unit]
+# Work around for lack of https://github.com/coreos/rpm-ostree/pull/3523/commits/0556152adb14a8e1cdf6c5d6f234aacbe8dd4e3f
+# on older RHEL
+StartLimitBurst=1000
diff --git a/tests/kola/rpm-ostree/startlimit.sh b/tests/kola/rpm-ostree/startlimit.sh
new file mode 100644
index 000000000..2b0707d60
--- /dev/null
+++ b/tests/kola/rpm-ostree/startlimit.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -euo pipefail
+# https://github.com/coreos/rpm-ostree/pull/3523/commits/0556152adb14a8e1cdf6c5d6f234aacbe8dd4e3f
+for x in $(seq 10); do rpm-ostree status >/dev/null; done
+echo ok