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: Ask timeouts with GetUserADM (DEV-1443) #2267

merged 10 commits into from Oct 25, 2022


Copy link

@irinaschubert irinaschubert commented Oct 24, 2022

Issue Number: DEV-1443

Pull Request Checklist

Basic Requirements

Please check if your PR fulfills the following requirements:

  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)

PR Type

What kind of change does this PR introduce?

  • Bugfix: represents bug fixes
  • Refactor: represents production code refactoring
  • Feature: represents a new feature
  • Documentation: documentation changes (no production code change)
  • Chore: maintenance tasks (no production code change)
  • Style: styles updates (no production code change)
  • Test: all about tests: adding, refactoring tests (no production code change)
  • Other... Please describe:

Does this PR introduce a breaking change?

  • Yes
  • No

Does this PR change client-test-data?

  • Yes (don't forget to update the JS-LIB team about the change)
  • No

Other information

I set an increased timeout to the Authenticator. The rest is refactoring/clean-up.

@irinaschubert irinaschubert self-assigned this Oct 24, 2022
Copy link

swarmia bot commented Oct 24, 2022

✅  Linked to Bug DEV-1443 · DSP-API: Ask timeouts

@@ -792,7 +814,7 @@ object Authenticator extends InstrumentationSupport {
userInformationTypeADM = UserInformationTypeADM.Full,
requestingUser = KnoraSystemInstances.Users.SystemUser
)(Duration(100, SECONDS))
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the actual bug fix, I removed the former timeout (on line 453) and added an increased timeout explicitly here. I set it to 100 sec, the same as we did in the recent fix for ask timeouts with the ProjectGetADM request:

.ask(ProjectGetADM(ProjectIdentifierADM(maybeShortcode = shortcode)))(Duration(100, SECONDS))

@irinaschubert irinaschubert marked this pull request as ready for review October 24, 2022 15:58
Copy link

codecov bot commented Oct 25, 2022

Codecov Report

Base: 86.85% // Head: 86.85% // Decreases project coverage by -0.00% ⚠️

Coverage data is based on head (8303282) compared to base (c5c98ce).
Patch coverage: 87.50% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2267      +/-   ##
- Coverage   86.85%   86.85%   -0.01%     
  Files         241      241              
  Lines       27967    27983      +16     
+ Hits        24292    24305      +13     
- Misses       3675     3678       +3     
Impacted Files Coverage Δ
...c/main/scala/org/knora/webapi/core/AppServer.scala 89.55% <ø> (ø)
...ages/util/search/gravsearch/GravsearchParser.scala 68.13% <0.00%> (-0.26%) ⬇️
...ora/webapi/responders/v2/OntologyResponderV2.scala 91.53% <ø> (ø)
...knora/webapi/responders/v2/SearchResponderV2.scala 90.95% <ø> (ø)
...scala/org/knora/webapi/routing/Authenticator.scala 88.88% <ø> (-0.08%) ⬇️ 84.61% <ø> (ø)
...ebapi/store/cache/impl/CacheServiceInMemImpl.scala 100.00% <ø> (ø)
...a/webapi/store/iiif/impl/IIIFServiceSipiImpl.scala 84.76% <ø> (ø)
.../store/triplestore/TriplestoreServiceManager.scala 69.56% <ø> (ø)
...n/scala/org/knora/webapi/routing/HealthRoute.scala 69.81% <50.00%> (-1.89%) ⬇️
... and 5 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

Copy link

@BalduinLandolt BalduinLandolt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good

@irinaschubert irinaschubert merged commit 3f77b6e into main Oct 25, 2022
8 checks passed
@irinaschubert irinaschubert deleted the wip/dev-1443-ask-timeouts branch October 25, 2022 07:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
None yet
None yet

Successfully merging this pull request may close these issues.

None yet

4 participants