Check for additional file events in watch event poll #12384
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
Signed-off-by: Vladyslav Zhukovskyi <vzhukovs@redhat.com>
|
ci-test |
|
Results of automated E2E tests of Eclipse Che Multiuser on OCP: |
|
ci-build |
vzhukovs
added
kind/bug
vzhukovs
changed the title
|
Selenium tests execution on Eclipse Che Multiuser on OCP (https://ci.codenvycorp.com/job/che-pullrequests-test-ocp/1408/) doesn't show any regression against this Pull Request. |
vparfonov
reviewed
Jan 16, 2019
| @@ -269,33 +270,35 @@ private void run() { | |||
| continue; | |||
| } | |||
|
|
|||
| List<WatchEvent<?>> watchEvents = watchKey.pollEvents(); | |||
| for (List<WatchEvent<?>> watchEvents = watchKey.pollEvents(); | |||
There was a problem hiding this comment.
maybe while statement here make code more readable ?
There was a problem hiding this comment.
You mean something like this?:
List<WatchEvent<?>> watchEvents = watchKey.pollEvents();
while(!watchEvents.isEmpty()) {
if (suspended.get()) {
...
}
for (WatchEvent<?> event : watchEvents) {
...
}
watchEvents = watchKey.pollEvents();
}
Signed-off-by: Vladyslav Zhukovskyi <vzhukovs@redhat.com>
|
ci-build |
dkulieshov
approved these changes
Jan 21, 2019
Signed-off-by: Vladyslav Zhukovskyi <vzhukovs@redhat.com>
|
ci-build |
vparfonov
approved these changes
Jan 24, 2019
che-bot
removed
the
status/code-review
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 changes proposal adds fix for the problem related to sequential handling file watcher events. The problem is in mechanism of receiving events: https://github.com/eclipse/che/blob/master/wsagent/che-core-api-project/src/main/java/org/eclipse/che/api/watcher/server/impl/FileWatcherService.java#L272. We try to get events and continue work with them but we don't check that in this moment we can receive additional events.
Use case to reproduce such problem: use git repository with the following structure:
clone this repo into che and make outside operation to make the following structure:
file watcher detects changes and we call https://github.com/eclipse/che/blob/master/wsagent/che-core-api-project/src/main/java/org/eclipse/che/api/watcher/server/impl/FileWatcherService.java#L272 we receive two events about delete
file1anddir, but in a moment we receive rest two events that is not handled forfile2andfile3.Signed-off-by: Vladyslav Zhukovskyi vzhukovs@redhat.com
What issues does this PR fix or reference?
#11648
Release Notes
N/A
Docs PR
N/A