Extend Git retry mechanism to git push race conditions on secrets/templates repos #426
Description
Expected behavior
As a coab operator
- in order to avoid coab provisionning failure due to race conditions on secret/template repos https://github.com/orange-cloudfoundry/paas-templates/issues/1257
- I expect the configured retry policy from to also be applied to rebases while avoiding too long delays
Observed behavior
The retry mechanism is apparently not working and failing at 1st push error
2021-08-17T13:07:47.01+0000 [APP/PROC/WEB/0] OUT java.lang.IllegalArgumentException: java.lang.RuntimeException: failed to push: remote conflict. re-push following rebase failed with: secondPushFailure
s=[REJECTED_NONFASTFORWARD]
2021-08-17T13:07:47.01+0000 [APP/PROC/WEB/0] OUT at com.orange.oss.cloudfoundry.broker.opsautomation.ondemandbroker.git.SimpleGitManager.commitPushRepo(SimpleGitManager.java:363) ~[cf-ops-automatio
n-broker-core-1.8.0.jar:1.8.0]
2021-08-17T13:07:47.01+0000 [APP/PROC/WEB/0] OUT at com.orange.oss.cloudfoundry.broker.opsautomation.ondemandbroker.git.RetrierGitManager.lambda$commitPushRepo$4(RetrierGitManager.java:51) ~[cf-ops
-automation-broker-core-1.8.0.jar:1.8.0]
2021-08-17T13:07:47.01+0000 [APP/PROC/WEB/0] OUT at net.jodah.failsafe.Functions.lambda$toSupplier$11(Functions.java:248) ~[failsafe-2.4.1.jar:2.4.1]
2021-08-17T13:07:47.01+0000 [APP/PROC/WEB/0] OUT at net.jodah.failsafe.Functions.lambda$get$0(Functions.java:48) ~[failsafe-2.4.1.jar:2.4.1]
2021-08-17T13:07:47.01+0000 [APP/PROC/WEB/0] OUT at net.jodah.failsafe.RetryPolicyExecutor.lambda$supply$0(RetryPolicyExecutor.java:62) ~[failsafe-2.4.1.jar:2.4.1]
2021-08-17T13:07:47.01+0000 [APP/PROC/WEB/0] OUT at net.jodah.failsafe.Execution.executeSync(Execution.java:128) ~[failsafe-2.4.1.jar:2.4.1]
2021-08-17T13:07:47.01+0000 [APP/PROC/WEB/0] OUT at net.jodah.failsafe.FailsafeExecutor.call(FailsafeExecutor.java:376) ~[failsafe-2.4.1.jar:2.4.1]
2021-08-17T13:07:47.01+0000 [APP/PROC/WEB/0] OUT at net.jodah.failsafe.FailsafeExecutor.run(FailsafeExecutor.java:223) ~[failsafe-2.4.1.jar:2.4.1]
2021-08-17T13:07:47.01+0000 [APP/PROC/WEB/0] OUT at com.orange.oss.cloudfoundry.broker.opsautomation.ondemandbroker.git.RetrierGitManager.commitPushRepo(RetrierGitManager.java:49) ~[cf-ops-automati
on-broker-core-1.8.0.jar:1.8.0]
2021-08-17T13:07:47.01+0000 [APP/PROC/WEB/0] OUT at com.orange.oss.cloudfoundry.broker.opsautomation.ondemandbroker.git.PooledGitManager.commitPushRepo(PooledGitManager.java:69) ~[cf-ops-automation
-broker-core-1.8.0.jar:1.8.0]
2021-08-17T13:07:47.01+0000 [APP/PROC/WEB/0] OUT at com.orange.oss.cloudfoundry.broker.opsautomation.ondemandbroker.git.GitProcessor.commitPushRepo(GitProcessor.java:72) ~[cf-ops-automation-broker-
core-1.8.0.jar:1.8.0]
2021-08-17T13:07:47.01+0000 [APP/PROC/WEB/0] OUT at com.orange.oss.cloudfoundry.broker.opsautomation.ondemandbroker.git.GitProcessor.postCreate(GitProcessor.java:24) ~[cf-ops-automation-broker-core
-1.8.0.jar:1.8.0]
2021-08-17T13:07:47.01+0000 [APP/PROC/WEB/0] OUT at com.orange.oss.cloudfoundry.broker.opsautomation.ondemandbroker.processors.ProcessorChain.create(ProcessorChain.java:46) ~[cf-ops-automation-brok
Metadata
Metadata
Assignees
Labels
No labels