Skip to content

Commit

Permalink
Merge branch 'dev' into test/harden-lease-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
Arkatufus authored Nov 19, 2024
2 parents 881aed5 + bd8a823 commit ba09499
Show file tree
Hide file tree
Showing 4 changed files with 255 additions and 231 deletions.
191 changes: 100 additions & 91 deletions src/core/Akka.Remote.Tests/RemotingSpec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,102 +43,105 @@ public RemotingSpec(ITestOutputHelper helper) : base(GetConfig(), helper)

_remote = _remoteSystem.ActorOf(Props.Create<Echo2>(), "echo");
_here = Sys.ActorSelection("akka.test://remote-sys@localhost:12346/user/echo");

AtStartup();
}

private static string GetConfig()
{
return @"
common-helios-settings {
port = 0
hostname = ""localhost""
#enforce-ip-family = true
}
akka {
actor.provider = remote
remote {
transport = ""Akka.Remote.Remoting,Akka.Remote""
actor.serialize-messages = off
retry-gate-closed-for = 1 s
log-remote-lifecycle-events = on
enabled-transports = [
""akka.remote.test"",
""akka.remote.dot-netty.tcp"",
# ""akka.remote.dot-netty.udp""
]
dot-netty.tcp = ${common-helios-settings}
helios.udp = ${common-helios-settings}
test {
transport-class = ""Akka.Remote.Transport.TestTransport,Akka.Remote""
applied-adapters = []
registry-key = aX33k0jWKg
local-address = ""test://RemotingSpec@localhost:12345""
maximum-payload-bytes = 32000b
scheme-identifier = test
}
}
actor.deployment {
/blub.remote = ""akka.test://remote-sys@localhost:12346""
/echo.remote = ""akka.test://remote-sys@localhost:12346""
/looker/child.remote = ""akka.test://remote-sys@localhost:12346""
/looker/child/grandchild.remote = ""akka.test://RemotingSpec@localhost:12345""
}
test.timefactor = 2.5
}";
}

private string GetOtherRemoteSysConfig()
{
return @"
common-helios-settings {
port = 0
hostname = ""localhost""
#enforce-ip-family = true
}
akka {
actor.provider = remote
remote {
transport = ""Akka.Remote.Remoting,Akka.Remote""
retry-gate-closed-for = 1 s
log-remote-lifecycle-events = on
enabled-transports = [
""akka.remote.test"",
""akka.remote.dot-netty.tcp"",
#""akka.remote.helios.udp""
]
dot-netty.tcp = ${common-helios-settings}
helios.udp = ${common-helios-settings}
test {
transport-class = ""Akka.Remote.Transport.TestTransport,Akka.Remote""
applied-adapters = []
registry-key = aX33k0jWKg
local-address = ""test://remote-sys@localhost:12346""
maximum-payload-bytes = 128000b
scheme-identifier = test
}
}
actor.deployment {
/blub.remote = ""akka.test://remote-sys@localhost:12346""
/looker/child.remote = ""akka.test://remote-sys@localhost:12346""
/looker/child/grandchild.remote = ""akka.test://RemotingSpec@localhost:12345""
}
}";
return """

common-helios-settings {
port = 0
hostname = "localhost"
#enforce-ip-family = true
}

akka {
actor.provider = remote

remote {
transport = "Akka.Remote.Remoting,Akka.Remote"
actor.serialize-messages = off

retry-gate-closed-for = 1 s
log-remote-lifecycle-events = on

enabled-transports = [
"akka.remote.test",
"akka.remote.dot-netty.tcp",
# "akka.remote.dot-netty.udp"
]

dot-netty.tcp = ${common-helios-settings}
helios.udp = ${common-helios-settings}

test {
transport-class = "Akka.Remote.Transport.TestTransport,Akka.Remote"
applied-adapters = []
registry-key = aX33k0jWKg
local-address = "test://RemotingSpec@localhost:12345"
maximum-payload-bytes = 32000b
scheme-identifier = test
}
}

actor.deployment {
/blub.remote = "akka.test://remote-sys@localhost:12346"
/echo.remote = "akka.test://remote-sys@localhost:12346"
/looker/child.remote = "akka.test://remote-sys@localhost:12346"
/looker/child/grandchild.remote = "akka.test://RemotingSpec@localhost:12345"
}

test.timefactor = 2.5
}
""";
}

private static string GetOtherRemoteSysConfig()
{
return """

common-helios-settings {
port = 0
hostname = "localhost"
#enforce-ip-family = true
}

akka {
actor.provider = remote

remote {
transport = "Akka.Remote.Remoting,Akka.Remote"

retry-gate-closed-for = 1 s
log-remote-lifecycle-events = on

enabled-transports = [
"akka.remote.test",
"akka.remote.dot-netty.tcp",
#"akka.remote.helios.udp"
]

dot-netty.tcp = ${common-helios-settings}
helios.udp = ${common-helios-settings}

test {
transport-class = "Akka.Remote.Transport.TestTransport,Akka.Remote"
applied-adapters = []
registry-key = aX33k0jWKg
local-address = "test://remote-sys@localhost:12346"
maximum-payload-bytes = 128000b
scheme-identifier = test
}
}

actor.deployment {
/blub.remote = "akka.test://remote-sys@localhost:12346"
/looker/child.remote = "akka.test://remote-sys@localhost:12346"
/looker/child/grandchild.remote = "akka.test://RemotingSpec@localhost:12345"
}
}
""";
}

private ActorSystem _remoteSystem;
Expand Down Expand Up @@ -684,6 +687,12 @@ public async Task Nobody_should_be_converted_back_to_its_singleton()
await ExpectMsgAsync(ActorRefs.Nobody, TimeSpan.FromSeconds(1.5));
}

[Fact]
public async Task Should_reply_back_on_original_Transport()
{

}

#endregion

#region Internal Methods
Expand Down
123 changes: 123 additions & 0 deletions src/core/Akka.Remote.Tests/Transport/MultiTransportAddressingSpec.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
// -----------------------------------------------------------------------
// <copyright file="Bugfix7378Spec.cs" company="Akka.NET Project">
// Copyright (C) 2009-2024 Lightbend Inc. <http://www.lightbend.com>
// Copyright (C) 2013-2024 .NET Foundation <https://github.com/akkadotnet/akka.net>
// </copyright>
// -----------------------------------------------------------------------

using System;
using System.Threading.Tasks;
using Akka.Actor;
using Akka.Configuration;
using Akka.TestKit;
using Xunit;
using Xunit.Abstractions;

namespace Akka.Remote.Tests.Transport;

/// <summary>
/// Added this spec to prove the existence of https://github.com/akkadotnet/akka.net/issues/7378
/// </summary>
public class MultiTransportAddressingSpec : AkkaSpec
{
public MultiTransportAddressingSpec(ITestOutputHelper output) : base(GetConfig(Sys1Port1, Sys1Port2), output)
{
}

public const int Sys1Port1 = 9991;
public const int Sys1Port2 = 9992;

public const int Sys2Port1 = 9993;
public const int Sys2Port2 = 9994;

private static Config GetConfig(int transportPort1, int transportPort2)
{
return $$"""

akka {
actor.provider = remote
remote {
enabled-transports = [
"akka.remote.test1",
"akka.remote.test2"
]
test1 {
transport-class = "Akka.Remote.Transport.TestTransport, Akka.Remote"
applied-adapters = []
registry-key = aX33k0jWKg
local-address = "test1://MultiTransportSpec@localhost:{{transportPort1}}"
maximum-payload-bytes = 32000b
scheme-identifier = test1
}
test2 {
transport-class = "Akka.Remote.Transport.TestTransport, Akka.Remote"
applied-adapters = []
registry-key = aX33k0j11c
local-address = "test2://MultiTransportSpec@localhost:{{transportPort2}}"
maximum-payload-bytes = 32000b
scheme-identifier = test2
}
}
}

""";
}


[Fact]
public async Task Should_Use_Second_Transport_For_Communication()
{
var secondSystem = ActorSystem.Create("MultiTransportSpec", GetConfig(Sys2Port1, Sys2Port2).WithFallback(Sys.Settings.Config));
InitializeLogger(secondSystem);
var assertProbe = CreateTestProbe(secondSystem);

try
{

var echoActor = secondSystem.ActorOf(Props.Create(() => new EchoActor(assertProbe)), "echo");

// use the first connection
await PingAndVerify("test1", Sys2Port1);

// use the second connection
await PingAndVerify("test2", Sys2Port2);
}
finally
{
Shutdown(secondSystem);
}

async Task PingAndVerify(string scheme, int port)
{
var selection = Sys.ActorSelection($"akka.{scheme}://MultiTransportSpec@localhost:{port}/user/echo");
selection.Tell("ping", TestActor);

var reply = await ExpectMsgAsync<string>(TimeSpan.FromSeconds(3));
Assert.Equal("pong", reply);

var senderFromNode2Pov = await assertProbe.ExpectMsgAsync<IActorRef>();
Assert.Contains(scheme, senderFromNode2Pov.Path.Address.Protocol);

var senderPath = LastSender.Path.ToString();
Assert.Contains(scheme, senderPath);
}
}

public class EchoActor : ReceiveActor
{
private readonly IActorRef _testProbe;

public EchoActor(IActorRef testProbe)
{
_testProbe = testProbe;
Receive<string>(msg =>
{
if (msg == "ping")
{
_testProbe.Tell(Sender);
Sender.Tell("pong");
}
});
}
}
}
4 changes: 2 additions & 2 deletions src/core/Akka.Remote.Tests/Transport/TestTransportSpec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public async Task TestTransport_must_return_an_Address_and_TaskCompletionSource_
Assert.NotNull(result.Item2);

var snapshot = registry.LogSnapshot();
Assert.Equal(1, snapshot.Count);
Assert.Single(snapshot);
Assert.IsType<ListenAttempt>(snapshot[0]);
Assert.Equal(_addressA, ((ListenAttempt)snapshot[0]).BoundAddress);
}
Expand Down Expand Up @@ -201,7 +201,7 @@ public async Task TestTransport_should_emulate_disassociation()
Assert.NotNull(msg);

exists = registry.ExistsAssociation(_addressA, _addressB);
Assert.True(!exists, "Association should no longer exist");
Assert.False(exists);

var disassociateAttempt = registry.LogSnapshot().Single(x => x is DisassociateAttempt).AsInstanceOf<DisassociateAttempt>();
Assert.True(disassociateAttempt.Requestor.Equals(_addressA) && disassociateAttempt.Remote.Equals(_addressB));
Expand Down
Loading

0 comments on commit ba09499

Please sign in to comment.