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(discovery): retry failed target connections (backport #1593) #1600

Merged
merged 4 commits into from
Jul 27, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 27, 2023

This is an automatic backport of pull request #1593 done by Mergify.
Cherry-pick of bf86535 has failed:

On branch mergify/bp/cryostat-v2.3/pr-1593
Your branch is up to date with 'origin/cryostat-v2.3'.

You are currently cherry-picking commit bf865351.
  (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:   src/main/java/io/cryostat/discovery/DiscoveryStorage.java
	modified:   src/main/java/io/cryostat/recordings/JvmIdHelper.java
	modified:   src/test/java/io/cryostat/discovery/DiscoveryStorageTest.java
	modified:   src/test/java/itest/bases/ExternalTargetsTest.java

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   compose/compose-cryostat.yaml
	deleted by us:   compose/compose-vertx-jmx.yaml
	deleted by us:   smoketest-docker.sh
	both modified:   smoketest.sh

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

(cherry picked from commit bf86535)

# Conflicts:
#	compose/compose-cryostat.yaml
#	compose/compose-vertx-jmx.yaml
#	smoketest-docker.sh
#	smoketest.sh
@github-actions
Copy link
Contributor

Hi @mergify[bot]! Add at least one of the required labels to this PR

Required labels are : chore,ci,cleanup,docs,feat,fix,perf,refactor,style,test

@github-actions github-actions bot added the needs-triage Needs thorough attention from code reviewers label Jul 27, 2023
@github-actions
Copy link
Contributor

Hi @mergify[bot]! Add at least one of the required labels to this PR

Required labels are : chore,ci,cleanup,docs,feat,fix,perf,refactor,style,test

@andrewazores andrewazores added fix and removed conflicts needs-triage Needs thorough attention from code reviewers labels Jul 27, 2023
@andrewazores andrewazores merged commit 07238cc into cryostat-v2.3 Jul 27, 2023
10 checks passed
@mergify mergify bot deleted the mergify/bp/cryostat-v2.3/pr-1593 branch July 27, 2023 19:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

1 participant