Skip to content

fix(runtime): use private synchronization lock for ActivationData #10068

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.

Sign up for GitHub

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

Draft
ReubenBond wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(runtime): use private synchronization lock for ActivationData #10068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/Orleans.Runtime/Catalog/ActivationCollector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public int GetNumRecentlyUsed(TimeSpan recencyPeriod)
/// </param>
public void ScheduleCollection(ICollectibleGrainContext item, TimeSpan timeout, DateTime now)
{
lock (item)
lock (ActivationData.GetSynchronizationLock(item))
{
if (item.IsExemptFromCollection)
{
Expand Down Expand Up @@ -131,7 +131,7 @@ public bool TryCancelCollection(ICollectibleGrainContext item)
if (item is null) return false;
if (item.IsExemptFromCollection) return false;

lock (item)
lock (ActivationData.GetSynchronizationLock(item))
{
DateTime ticket = item.CollectionTicket;
if (default == ticket) return false;
Expand All @@ -154,7 +154,7 @@ public bool TryRescheduleCollection(ICollectibleGrainContext item)
{
if (item.IsExemptFromCollection) return false;

lock (item)
lock (ActivationData.GetSynchronizationLock(item))
{
if (TryRescheduleCollection_Impl(item, item.CollectionAgeLimit)) return true;

Expand Down Expand Up @@ -236,7 +236,7 @@ public List<ICollectibleGrainContext> ScanStale()
// If the activation is to be reactivated, it's our job to clear the activation's copy of the ticket.
foreach (var activation in activations)
{
lock (activation)
lock (ActivationData.GetSynchronizationLock(activation))
{
activation.CollectionTicket = default;
if (!activation.IsValid)
Expand Down Expand Up @@ -283,7 +283,7 @@ public List<ICollectibleGrainContext> ScanAll(TimeSpan ageLimit)
foreach (var kvp in bucket.Items)
{
var activation = kvp.Value;
lock (activation)
lock (ActivationData.GetSynchronizationLock(activation))
{
if (!activation.IsValid)
{
Expand Down Expand Up @@ -691,7 +691,7 @@ public void Add(ICollectibleGrainContext item)

public bool TryRemove(ICollectibleGrainContext item)
{
lock (item)
lock (ActivationData.GetSynchronizationLock(item))
{
if (item.CollectionTicket == default)
{
Expand All @@ -711,7 +711,7 @@ public List<ICollectibleGrainContext> CancelAll()
{
// Attempt to cancel the item. if we succeed, it wasn't already cancelled and we can return it. otherwise, we silently ignore it.
var item = pair.Value;
lock (item)
lock (ActivationData.GetSynchronizationLock(item))
{
if (item.CollectionTicket == default)
{
Expand Down
Loading
Loading