fix(judgements): Fix/manual judgment concurrent execution (backport #4410)
This is an automatic backport of pull request #4410 done by Mergify. Cherry-pick of 706ffb42553ad9723290f331f83004d94a9412b4 has failed:
On branch mergify/bp/release-1.29.x/pr-4410
Your branch is up to date with 'origin/release-1.29.x'.
You are currently cherry-picking commit 706ffb425.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: orca-core/orca-core.gradle
modified: orca-core/src/main/java/com/netflix/spinnaker/orca/config/OrcaConfiguration.java
new file: orca-core/src/main/java/com/netflix/spinnaker/orca/lock/ExternalLock.kt
new file: orca-core/src/main/java/com/netflix/spinnaker/orca/lock/LockConfig.kt
new file: orca-core/src/main/java/com/netflix/spinnaker/orca/lock/RetriableLock.java
modified: orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/CompoundExecutionOperator.java
modified: orca-core/src/test/groovy/com/netflix/spinnaker/orca/pipeline/CompoundExecutionOperatorSpec.groovy
modified: orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/CompoundExecutionOperatorTest.java
new file: orca-core/src/test/kotlin/com/netflix/spinnaker/orca/lock/NoOpRunOnLockAcquiredTest.kt
new file: orca-core/src/test/kotlin/com/netflix/spinnaker/orca/lock/RetriableLockTest.java
new file: orca-core/src/test/kotlin/com/netflix/spinnaker/orca/lock/RunOnRedisLockAcquiredTest.kt
new file: orca-core/src/test/kotlin/com/netflix/spinnaker/orca/lock/RunOnShedLockAcquiredTest.kt
modified: orca-interlink/src/test/groovy/com/netflix/spinnaker/orca/interlink/InterlinkSpec.groovy
modified: orca-redis/src/main/java/com/netflix/spinnaker/orca/config/RedisConfiguration.java
modified: orca-sql/orca-sql.gradle
modified: orca-sql/src/main/kotlin/com/netflix/spinnaker/config/SqlConfiguration.kt
modified: orca-sql/src/main/resources/db/changelog-master.yml
new file: orca-sql/src/main/resources/db/changelog/20230309-shedlock.yml
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: orca-queue/src/main/kotlin/com/netflix/spinnaker/orca/q/handler/RunTaskHandler.kt
both modified: orca-queue/src/test/kotlin/com/netflix/spinnaker/orca/q/handler/RunTaskHandlerTest.kt
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
-
@Mergifyio refreshwill re-evaluate the rules -
@Mergifyio rebasewill rebase this PR on its base branch -
@Mergifyio updatewill merge the base branch into this PR -
@Mergifyio backport <destination>will backport this PR on<destination>branch
Additionally, on Mergify dashboard you can:
- look at your merge queues
- generate the Mergify configuration with the config editor.
Finally, you can contact us on https://mergify.com
Features cannot be merged into release branches. The following commits are not tagged as one of "fix, chore, docs, perf, test":
- 1da5bc84043b67d79d0bfb44bfa4394d3ecfe044: Fix/manual judgment concurrent execution (#4410)
Read more about commit conventions and patch releases here.