From bbf6d60f36e4b7496c7711ddff438f875a4c1661 Mon Sep 17 00:00:00 2001 From: Filip Filmar Date: Tue, 2 Apr 2019 10:06:00 -0700 Subject: [PATCH] git-sync: removes special exit on first error Old code used to exit at any error seen on first sync attempt. This didn't prove useful in practice, so removing that special case. This may make git-sync slower to recover after user fixes a non-retryable error, as now flMaxSyncFailures are needed before the pod fails. It may make sense in practice. Fixes #161, in a different way than is proposed in PR #162. --- cmd/git-sync/main.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/git-sync/main.go b/cmd/git-sync/main.go index 18fe367..872338e 100644 --- a/cmd/git-sync/main.go +++ b/cmd/git-sync/main.go @@ -289,7 +289,8 @@ func main() { if changed, err := syncRepo(ctx, *flRepo, *flBranch, *flRev, *flDepth, *flRoot, *flDest); err != nil { syncDuration.WithLabelValues("error").Observe(time.Now().Sub(start).Seconds()) syncCount.WithLabelValues("error").Inc() - if initialSync || (*flMaxSyncFailures != -1 && failCount >= *flMaxSyncFailures) { + if *flMaxSyncFailures != -1 && failCount >= *flMaxSyncFailures { + // Exit after too many retries, maybe the error is not recoverable. log.Error(err, "failed to sync repo, aborting") os.Exit(1) }