From 3aae55e7f649836c070487b278ac34b1bd100d7d Mon Sep 17 00:00:00 2001
From: Alex Crawford <crawford@redhat.com>
Date: Fri, 18 Jan 2019 12:04:16 -0800
Subject: [PATCH] data/bootstrap: retry when reporting progress

Previously, report-progress.sh relied on systemd to perform its retry
logic. Unfortunately, this causes the logs to fill up with entries like
the following:

    systemd[1]: progress.service holdoff time over, scheduling restart.
    systemd[1]: Stopped Report the completion of the cluster bootstrap
                process.
    systemd[1]: Starting Report the completion of the cluster bootstrap
                process...
    systemd[1]: Stopped Report the completion of the cluster bootstrap
    systemd[1]: progress.service: control process exited, code=exited
                status=1
    systemd[1]: Failed to start Report the completion of the cluster
                bootstrap process.
    systemd[1]: Unit progress.service entered failed state.
    systemd[1]: progress.service failed.

By adding the retry logic to report-progress.sh, these verbose logs are
avoided.
---
 .../files/usr/local/bin/report-progress.sh    | 48 ++++++++++++-------
 .../bootstrap/systemd/units/progress.service  |  3 --
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/data/data/bootstrap/files/usr/local/bin/report-progress.sh b/data/data/bootstrap/files/usr/local/bin/report-progress.sh
index 58d9a966420..d3245c31c4e 100755
--- a/data/data/bootstrap/files/usr/local/bin/report-progress.sh
+++ b/data/data/bootstrap/files/usr/local/bin/report-progress.sh
@@ -1,26 +1,38 @@
 #!/usr/bin/env bash
-set -e
 
 KUBECONFIG="${1}"
 NAME="${2}"
 MESSAGE="${3}"
-TIMESTAMP="$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
 
-echo "Reporting install progress..."
+wait_for_existance() {
+	while [ ! -e "${1}" ]
+	do
+		sleep 5
+	done
+}
+
+echo "Waiting for bootstrap to complete..."
+wait_for_existance /opt/openshift/.bootkube.done
+wait_for_existance /opt/openshift/.openshift.done
 
-oc --config="$KUBECONFIG" create -f - <<EOF
-apiVersion: v1
-kind: Event
-metadata:
-  name: "${NAME}"
-  namespace: kube-system
-involvedObject:
-  namespace: kube-system
-message: "${MESSAGE}"
-firstTimestamp: "${TIMESTAMP}"
-lastTimestamp: "${TIMESTAMP}"
-count: 1
-source:
-  component: cluster
-  host: $(hostname)
+echo "Reporting install progress..."
+timestamp="$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
+while ! oc --config="$KUBECONFIG" create -f - <<-EOF
+	apiVersion: v1
+	kind: Event
+	metadata:
+	  name: "${NAME}"
+	  namespace: kube-system
+	involvedObject:
+	  namespace: kube-system
+	message: "${MESSAGE}"
+	firstTimestamp: "${timestamp}"
+	lastTimestamp: "${timestamp}"
+	count: 1
+	source:
+	  component: cluster
+	  host: $(hostname)
 EOF
+do
+	sleep 5
+done
diff --git a/data/data/bootstrap/systemd/units/progress.service b/data/data/bootstrap/systemd/units/progress.service
index 57a3a532d22..a66554a1871 100644
--- a/data/data/bootstrap/systemd/units/progress.service
+++ b/data/data/bootstrap/systemd/units/progress.service
@@ -5,9 +5,6 @@ Wants=bootkube.service openshift.service
 After=bootkube.service openshift.service
 
 [Service]
-# Workaround for https://github.com/systemd/systemd/issues/1312 and https://github.com/opencontainers/runc/pull/1807
-ExecStartPre=/usr/bin/test -f /opt/openshift/.bootkube.done
-ExecStartPre=/usr/bin/test -f /opt/openshift/.openshift.done
 ExecStart=/usr/local/bin/report-progress.sh /opt/openshift/auth/kubeconfig bootstrap-complete "cluster bootstrapping has completed"
 
 Restart=on-failure