Increase journald rate limiter when running test-end-to-end-docker.sh

Author: soltysh

hack/lib/util/misc.sh

@@ -120,10 +120,11 @@ readonly -f os::util::format_seconds
 # Return:
 #  None
 function os::util::sed() {
+	local sudo="${USE_SUDO:+sudo}"
 	if LANG=C sed --help 2>&1 | grep -q "GNU sed"; then
-		sed -i'' "$@"
+		${sudo} sed -i'' "$@"
 	else
-		sed -i '' "$@"
+		${sudo} sed -i '' "$@"
 	fi
 }
 readonly -f os::util::sed
@@ -203,4 +204,4 @@ function os::util::curl_etcd() {
 function os::util::host_platform() {
 	echo "$(go env GOHOSTOS)/$(go env GOHOSTARCH)"
 }
-readonly -f os::util::host_platform
+readonly -f os::util::host_platform

hack/test-end-to-end-docker.sh

@@ -54,6 +54,10 @@ function cleanup()
 	os::test::junit::generate_oscmd_report
 	set -e
 
+	# restore journald to previous form
+	${USE_SUDO:+sudo} mv /etc/systemd/{journald.conf.bak,journald.conf}
+	${USE_SUDO:+sudo} systemctl restart systemd-journald.service
+
 	os::log::info "Exiting"
 	ENDTIME=$(date +%s); echo "$0 took $(($ENDTIME - $STARTTIME)) seconds"
 	exit $out
@@ -63,6 +67,13 @@ trap "cleanup" EXIT INT TERM
 
 os::log::system::start
 
+# This increases rate limits in journald to bypass the problem from
+# https://github.com/openshift/origin/issues/12558.
+${USE_SUDO:+sudo} cp /etc/systemd/{journald.conf,journald.conf.bak}
+os::util::sed "s/^.*RateLimitInterval.*$/RateLimitInterval=1s/g" /etc/systemd/journald.conf
+os::util::sed "s/^.*RateLimitBurst.*$/RateLimitBurst=10000/g" /etc/systemd/journald.conf
+${USE_SUDO:+sudo} systemctl restart systemd-journald.service
+
 out=$(
 	set +e
 	docker stop origin 2>&1