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

Lock access when writing event timings in display #16101

Merged
merged 1 commit into from
May 3, 2024

Conversation

lunaris
Copy link
Contributor

@lunaris lunaris commented May 2, 2024

This should fix #16085, in which we are getting concurrent reads and writes to the opStopwatch maps.

@lunaris lunaris requested a review from a team as a code owner May 2, 2024 09:43
@pulumi-bot
Copy link
Contributor

pulumi-bot commented May 2, 2024

Changelog

[uncommitted] (2024-05-03)

Bug Fixes

  • [backend] Fix concurrent reads from and writes to display resource timer maps
    #16101

@lunaris lunaris requested review from tgummerer and Frassle May 3, 2024 09:34
@lunaris lunaris added this pull request to the merge queue May 3, 2024
@lunaris lunaris removed this pull request from the merge queue due to a manual request May 3, 2024
This should fix #16085, in which we are getting concurrent reads and
writes to the `opStopwatch` maps.
@lunaris lunaris added this pull request to the merge queue May 3, 2024
Merged via the queue into master with commit f029bb9 May 3, 2024
49 checks passed
@lunaris lunaris deleted the wjones/pulumi-16085 branch May 3, 2024 12:38
@justinvp justinvp mentioned this pull request May 6, 2024
github-merge-queue bot pushed a commit that referenced this pull request May 6, 2024
To be merged after #16119 merges.

Tentative changelog:

- [backend] Fix concurrent reads from and writes to display resource
timer maps
  [#16101](#16101)

- [engine] Better handle property dependencies and deleted-with
relationships when pruning URNs, verifying snapshot integrity and
computing dependency graphs.
  [#16088](#16088)

- [programgen/python] Sort generated requirements.txt files when
generating Python programs
  [#16115](#16115)
tgummerer added a commit that referenced this pull request May 6, 2024
tgummerer added a commit that referenced this pull request May 6, 2024
The `m` mutex deadlocks in the display code.  Split it up into an
event mutex that works as it did before
#16101, and add a separate mutex
for the stopwatch, to avoid any deadlocks here.
tgummerer added a commit that referenced this pull request May 6, 2024
The `m` mutex deadlocks in the display code.  Split it up into an
event mutex that works as it did before
#16101, and add a separate mutex
for the stopwatch, to avoid any deadlocks here.
github-merge-queue bot pushed a commit that referenced this pull request May 6, 2024
The `m` mutex deadlocks in the display code. Split it up into an event
mutex that works as it did before
#16101, and add a separate mutex
for the stopwatch, to avoid any deadlocks here.


Fixes #16127
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CLI concurrent map read and map write panic
4 participants