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(reports): tune flags for reliability (backport #698) #747

Merged
merged 2 commits into from
Nov 3, 2021

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 3, 2021

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

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

You are currently cherry-picking commit c4cc64b1.
  (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:   run.sh
	modified:   src/test/java/io/cryostat/net/reports/SubprocessReportGeneratorTest.java

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   src/main/java/io/cryostat/net/reports/SubprocessReportGenerator.java
	deleted by us:   src/main/java/io/cryostat/net/web/http/generic/TimeoutHandler.java

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.io/

@github-actions
Copy link
Contributor

github-actions bot commented Nov 3, 2021

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

1 similar comment
@github-actions
Copy link
Contributor

github-actions bot commented Nov 3, 2021

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
Copy link
Member

@Mergifyio rebase

@mergify
Copy link
Author

mergify bot commented Nov 3, 2021

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
error: could not apply 250de15... fix(reports): tune flags for reliability (#698)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 250de15... fix(reports): tune flags for reliability (#698)
Auto-merging run.sh
CONFLICT (content): Merge conflict in run.sh

err-code: 1FEEC

* fix(reports): tune flags for reliability

* chore(run.sh): default to 512MB memory

* fix(timeouthandler): increase default timeout to 30s

* fix(reports): improve subprocess timeout handling

* chore(reports): remove unused constants

(cherry picked from commit c4cc64b)
@andrewazores andrewazores merged commit d9a0d84 into v2 Nov 3, 2021
@mergify mergify bot deleted the mergify/bp/v2/pr-698 branch November 3, 2021 19:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant