Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(judgements): Fix/manual judgment concurrent execution (backport #4410) #4494

Open
wants to merge 2 commits into
base: release-1.28.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 3, 2023

This is an automatic backport of pull request #4410 done by Mergify.
Cherry-pick of 706ffb4 has failed:

On branch mergify/bp/release-1.28.x/pr-4410
Your branch is up to date with 'origin/release-1.28.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
	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/rm <file>..." as appropriate to mark resolution)
	deleted by us:   orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/CompoundExecutionOperatorTest.java
	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 refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will 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

* fix(manual_judgment): added distributed locking to ensure sequential updates to execution's stages

* fix(manual_judgement): fixed test

* fix(blue-green-deploy): added docs and reformatted files

* fix(blue-green-deploy): bumped shedlock dependency version to 4.44.0

---------

Co-authored-by: Cameron Motevasselani <[email protected]>
Co-authored-by: ovidiupopa07 <[email protected]>
(cherry picked from commit 706ffb4)

# Conflicts:
#	orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/CompoundExecutionOperatorTest.java
#	orca-queue/src/main/kotlin/com/netflix/spinnaker/orca/q/handler/RunTaskHandler.kt
#	orca-queue/src/test/kotlin/com/netflix/spinnaker/orca/q/handler/RunTaskHandlerTest.kt
@spinnakerbot
Copy link
Contributor

Features cannot be merged into release branches. The following commits are not tagged as one of "fix, chore, docs, perf, test":

Read more about commit conventions and patch releases here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants