RUMM-416 FileReader - fix the concurrency issue #236
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mariusc83
changed the title
xgouchet
requested changes
Apr 24, 2020
|
|
||
| val firstBatch = testedReader.readNextBatch() | ||
| val secondBatch = testedReader.readNextBatch() | ||
| checkNotNull(firstBatch) | ||
| assertThat(secondBatch).isNull() |
There was a problem hiding this comment.
There's already a check on that below (line 110)
|
|
||
| // when | ||
| // f |
There was a problem hiding this comment.
:) don't know what I wanted to say there
| @@ -267,21 +269,27 @@ internal abstract class FilePersistenceStrategyTest<T : Any>( | |||
| } | |||
|
|
|||
| @Test | |||
| fun `read returns null when 1st batch is already sent but file still present`( | |||
| fun `reads null when batch already sent but the other thread is still trying to delete this`( | |||
There was a problem hiding this comment.
I think you should still keep the old test, and add this one too.
There was a problem hiding this comment.
Well....that's the thing...the first test is not relevant anymore because now we clean the lockedFiles if the file is removed from the system. I can add a test maybe to return null if the file could not be deleted.
mariusc83
force-pushed
the
mconstantin/rumm-416/filereader-fix-concurrency-issue
branch
from
a2c1121 to
b0d3850
Compare
mariusc83
force-pushed
the
mconstantin/rumm-416/filereader-fix-concurrency-issue
branch
from
b0d3850 to
f53601d
Compare
xgouchet
approved these changes
Apr 27, 2020
mariusc83
deleted the
mconstantin/rumm-416/filereader-fix-concurrency-issue
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
This PR fixes the concurrency issue we were experiencing in the FileReader. In short this class was using 2 sets to mark files as in progress or sent and only one of these 2 collections was synchronised. Furthermore there was a multithreaded access to this file (from the WorkManager and from the default DataUploadScheduler) and the application was seldom crashing with a ConcurrentModificationAccess.
Motivation
Opened issue #234 on our Github repository
Additional Notes
Anything else we should know when reviewing?
Review checklist (to be filled by reviewers)