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

ClusterStressSpec and Cluster Failure Detector Cleanup #4940

Merged
merged 7 commits into from
Apr 16, 2021
+1,741 −336
Merged

ClusterStressSpec and Cluster Failure Detector Cleanup #4940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
68e327f
implementation of Akka.Cluster.Tests.MultiNode.StressSpec
Aaronontheweb Apr 1, 2021
71be0a2
made MuteLog overrideable in Akka.Cluster.Testkit
Aaronontheweb Apr 6, 2021
576da66
if Roles is empty, then don't run the thunk on any nodes
Aaronontheweb Apr 6, 2021
b24e2fe
made it possible to actually enable Cluster.AssertInvariants via envi…
Aaronontheweb Apr 6, 2021
c71441e
added assert invariants to build script
Aaronontheweb Apr 6, 2021
ddeb9eb
ReSharper'd Reachability.cs
Aaronontheweb Apr 7, 2021
796eed9
cleaned up immutability and CAS issues inside DefaultFailureDetectorR…
Aaronontheweb Apr 7, 2021
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
2 changes: 2 additions & 0 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,7 @@ Target "MultiNodeTests" (fun _ ->

Target "MultiNodeTestsNetCore" (fun _ ->
if not skipBuild.Value then
setEnvironVar "akka.cluster.assert" "on" // needed to enable assert invariants for Akka.Cluster
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Causes MNTR runs to blow up if the Gossip class does something it shouldn't

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this be picked up by Akka, or do we need to change it to AKKA_CLUSTER_ASSERT?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I didn't realize it was picked up as is inside the code, but maybe we should follow our own environment variable naming standard by making this AKKA_CLUSTER_ASSERT?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah we should - I'll update on that on a subsequent PR. I need to tweak some of the timing settings for StressSpec since the build server is way underpowered compared to my development machine. I'll address that with this too.

let multiNodeTestPath = findToolInSubPath "Akka.MultiNodeTestRunner.dll" (currentDirectory @@ "src" @@ "core" @@ "Akka.MultiNodeTestRunner" @@ "bin" @@ "Release" @@ testNetCoreVersion @@ "win10-x64" @@ "publish")

let projects =
Expand Down Expand Up @@ -388,6 +389,7 @@ Target "MultiNodeTestsNetCore" (fun _ ->
)
Target "MultiNodeTestsNet" (fun _ ->
if not skipBuild.Value then
setEnvironVar "akka.cluster.assert" "on" // needed to enable assert invariants for Akka.Cluster
let multiNodeTestPath = findToolInSubPath "Akka.MultiNodeTestRunner.dll" (currentDirectory @@ "src" @@ "core" @@ "Akka.MultiNodeTestRunner" @@ "bin" @@ "Release" @@ testNetVersion @@ "win10-x64" @@ "publish")

let projects =
Expand Down
4 changes: 2 additions & 2 deletions src/common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<Copyright>Copyright © 2013-2021 Akka.NET Team</Copyright>
<Authors>Akka.NET Team</Authors>
<VersionPrefix>1.4.18</VersionPrefix>
<VersionPrefix>1.4.19</VersionPrefix>
<PackageIconUrl>https://getakka.net/images/akkalogo.png</PackageIconUrl>
<PackageProjectUrl>https://github.com/akkadotnet/akka.net</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/akkadotnet/akka.net/blob/master/LICENSE</PackageLicenseUrl>
Expand All @@ -29,7 +29,7 @@
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup>
<PropertyGroup>
<PackageReleaseNotes>Placeholder for Nightlies**</PackageReleaseNotes>
<PackageReleaseNotes>Placeholder for nightlies**</PackageReleaseNotes>
</PropertyGroup>
<!-- SourceLink support for all Akka.NET projects -->
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/core/Akka.Cluster.TestKit/MultiNodeClusterSpec.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ protected override void AfterTermination()

//TODO: ExpectedTestDuration?

void MuteLog(ActorSystem sys = null)
public virtual void MuteLog(ActorSystem sys = null)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needed this for changing MuteLog behavior in individual tests

{
if (sys == null) sys = Sys;
if (!sys.Log.IsDebugEnabled)
Expand Down
1 change: 1 addition & 0 deletions src/core/Akka.Cluster.Tests.MultiNode/Akka.Cluster.Tests.MultiNode.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<PropertyGroup>
<AssemblyTitle>Akka.Cluster.Tests.MultiNode</AssemblyTitle>
<TargetFrameworks>$(NetFrameworkTestVersion);$(NetTestVersion);$(NetCoreTestVersion)</TargetFrameworks>
<LangVersion>latest</LangVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/core/Akka.Cluster.Tests.MultiNode/Bugfix4353Specs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ protected Bugfix4353Spec(Bugfix4353SpecsConfig config) : base(config, typeof(Bug
}

[MultiNodeFact]
public void Bugfix4353Spec_Cluster_of_3_must_reach_cnovergence()
public void Bugfix4353Spec_Cluster_of_3_must_reach_convergence()
{
AwaitClusterUp(First, Second, Third);
EnterBarrier("after-1");
Expand Down
Loading