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 bulk import parsing bug and limit concurrent client connections #973

Merged
merged 9 commits into from
Aug 22, 2018

Conversation

benjamingeer
Copy link

@benjamingeer benjamingeer commented Aug 21, 2018

This fixes the parsing of properties in knora-base that are directly used in project-specific resource classes in XML bulk import data (e.g. knoraXmlImport__seqnum).

It also changes HttpTriplestoreConnector and SipiResponder so they block until getting an HTTP response, to ensure that the number of concurrent HTTP client connections won't exceed the number of instances of these actors.

Fixes #971.
Fixes #972.

@benjamingeer benjamingeer changed the title Fix/971 import seqnum Fix bulk import parsing bug and limit concurrent client connections Aug 21, 2018
@benjamingeer benjamingeer requested a review from subotic August 21, 2018 19:11
@codecov
Copy link

codecov bot commented Aug 21, 2018

Codecov Report

Merging #973 into develop will decrease coverage by 0.04%.
The diff coverage is 63.93%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #973      +/-   ##
===========================================
- Coverage    82.53%   82.49%   -0.05%     
===========================================
  Files          150      150              
  Lines        17004    17043      +39     
  Branches      1627     1623       -4     
===========================================
+ Hits         14035    14060      +25     
- Misses        2969     2983      +14
Flag Coverage Δ
#integration 46.14% <57.37%> (-0.01%) ⬇️
#unit_e2e 81.32% <45.9%> (-0.09%) ⬇️
Impacted Files Coverage Δ
...c/main/scala/org/knora/webapi/util/ActorUtil.scala 78.57% <ø> (+11.9%) ⬆️
...api/src/main/scala/org/knora/webapi/Settings.scala 90.09% <100%> (+0.3%) ⬆️
...g/knora/webapi/responders/v1/SipiResponderV1.scala 79.54% <56.52%> (-10.31%) ⬇️
...re/triplestore/http/HttpTriplestoreConnector.scala 83.41% <63.33%> (-0.48%) ⬇️
.../scala/org/knora/webapi/util/StringFormatter.scala 90.26% <80%> (+0.07%) ⬆️
...i/src/main/scala/org/knora/webapi/Exceptions.scala 34.78% <0%> (-4.35%) ⬇️
...org/knora/webapi/routing/v1/ResourcesRouteV1.scala 81.71% <0%> (+0.38%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d0dbe6f...b50d2f0. Read the comment docs.

Copy link
Collaborator

@subotic subotic left a comment

Choose a reason for hiding this comment

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

LGTM

@benjamingeer benjamingeer merged commit 7d37918 into develop Aug 22, 2018
@benjamingeer benjamingeer deleted the fix/971-import-seqnum branch August 22, 2018 15:15
@benjamingeer benjamingeer mentioned this pull request Sep 13, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
API/V1 bug something isn't working bulk-import
Projects
None yet
2 participants