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(timeout): remove HTTP timeout handler (backport #737) #738

Merged
merged 1 commit into from
Oct 28, 2021

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 26, 2021

This is an automatic backport of pull request #737 done by Mergify.
Cherry-pick of 3706fe2 has failed:

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

You are currently cherry-picking commit 3706fe20.
  (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/net/reports/ActiveRecordingReportCache.java
	modified:   src/main/java/io/cryostat/net/reports/ArchivedRecordingReportCache.java
	modified:   src/main/java/io/cryostat/net/web/http/api/v1/TargetReportGetHandler.java
	modified:   src/main/java/io/cryostat/net/web/http/generic/HttpGenericModule.java
	modified:   src/test/java/io/cryostat/net/reports/ActiveRecordingReportCacheTest.java
	modified:   src/test/java/io/cryostat/net/reports/ArchivedRecordingReportCacheTest.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 them: src/main/java/io/cryostat/net/web/http/generic/TimeoutHandler.java
	both modified:   src/test/java/io/cryostat/net/reports/SubprocessReportGeneratorTest.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

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

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

* fix(timeout): remove HTTP timeout handler

Remove TimeoutHandler - this was initially used as a hack around preventing clients from seeing indefinitely-long request "hangs" when requesting URL paths that didn't exist, such as web-client assets in a minimal build. This is now properly handled by the WebClientAssetsHandler responding with a 404 in a minimal build, or else a 200 with the index.html in a non-minimal build. Other actual assets, like .js bundles, fonts, images, continue to be handled by the StaticAssetsHandler. This leaves no real case where the TimeoutHandler was useful. However, there were cases where the TimeoutHandler could be triggered in undesirable ways - for example, long-running report generation, archive uploads, jfr-datasource uploads, and recording downloads.

* test(timeout): correct broken unit tests

(cherry picked from commit 3706fe2)
@andrewazores andrewazores merged commit ad2afc1 into v2 Oct 28, 2021
@mergify mergify bot deleted the mergify/bp/v2/pr-737 branch October 28, 2021 21:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant