Merge master into feature/py3: Fix races for CI
#5738
Merged
Conversation
This file contains hidden or 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
The code in 'next_task_id' has a race condition: ``` (* thread 1 *) 42 = !counter (* fine, integer ref operations are atomic on OCaml 4 *) result = string_of_int (* allocates, may process pending signals and switch to another OCaml thread! *) (* thread 2 *) 42 = !counter result = "42" incr counter (* fine, this is atomic on OCaml 4 *) result (* thread 2 got task id 42 *) (* thread 1 *) incr counter (* fine, this is atomic on OCaml 4 *) result (* thread 1 got same task id as thread 2: 42! *) ``` The solution is to: * use mutexes, * rearrange the order of operations to avoid allocations in the critical section * use Atomic.fetch_and_add (also makes this future proof for OCaml 5) Signed-off-by: Edwin Török <edwin.torok@cloud.com>
The previous unit test step has created some tasks, and deleted them when completed. However it didn't look at events. The next step was waiting for some newly created tasks to complete and looking at events. But it was processing all events, even those that it wasn't watching for. These events may have referred to tasks that were already deleted. Fix the code to only query the state of the tasks that we are waiting for (if these go missing, it is a bug). Signed-off-by: Edwin Török <edwin.torok@cloud.com>
…askbugfix CA-394882,CA-394883: Fix task server race condition, and testcase race condition
For regular replies we look at the request and reply with a matching version. However when we fail to parse the JsonRPC request itself then we don't know what version to use. XenCenter uses JsonRPC v2 by default, and JsonRPC v2 has been supported in XAPI for a long time. Signed-off-by: Edwin Török <edwin.torok@cloud.com>
…y3-for-2nd-ci-fix Signed-off-by: Bernhard Kaindl <bernhard.kaindl@cloud.com>
edwintorok
approved these changes
Jun 26, 2024
psafont
approved these changes
Jun 26, 2024
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.
This PR merges the latest
xen-api/masterbranch intoxen-api/feature/py3to fix race conditions in CI.Merging these latest commits from
masterintofeature/py3was recommended by @psafont and @edwintorok in #5733.FYI: @ashwin9390 and @stephenchengCloud