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.

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

Revert changes that are unrelated to the CoordinatedShutdown memory leak #5822

Merged
merged 1 commit into from
Apr 5, 2022
Merged

Revert changes that are unrelated to the CoordinatedShutdown memory leak #5822

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
8 changes: 2 additions & 6 deletions src/core/Akka/Actor/CoordinatedShutdown.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ private ClusterJoinUnsuccessfulReason() { }
/// <summary>
/// The <see cref="ActorSystem"/>
/// </summary>
public ExtendedActorSystem System { get; private set; }
public ExtendedActorSystem System { get; }

/// <summary>
/// The set of named <see cref="Phase"/>s that will be executed during coordinated shutdown.
Expand All @@ -261,7 +261,7 @@ private ClusterJoinUnsuccessfulReason() { }
/// <summary>
/// INTERNAL API
/// </summary>
internal ILoggingAdapter Log { get; private set; }
internal ILoggingAdapter Log { get; }

private readonly HashSet<string> _knownPhases;

Expand Down Expand Up @@ -660,9 +660,6 @@ internal static void InitPhaseActorSystemTerminate(ActorSystem system, Config co
Environment.Exit(0);
}

coord.System = null;
coord.Log = null;
coord._tasks.Clear(); // Clear the dictionary, just in case it is retained in memory
return Done.Instance;
});
}
Expand Down Expand Up @@ -697,7 +694,6 @@ internal static void InitClrHook(ActorSystem system, Config conf, CoordinatedShu
system.WhenTerminated.ContinueWith(tr =>
{
AppDomain.CurrentDomain.ProcessExit -= exitTask;
coord._clrShutdownTasks.Clear(); // Clear the tasks, just in case it is retained in memory
});

coord.AddClrShutdownHook(() =>
Expand Down