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

Jump to bottom

Rename HttpEndPointIp to HttpEndPointAddress #32

Merged
merged 1 commit into from
Jun 5, 2020
Merged

Rename HttpEndPointIp to HttpEndPointAddress #32

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
2 changes: 1 addition & 1 deletion src/EventStore.Client/ClusterMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class MemberInfo {

public VNodeState State { get; set; }
public bool IsAlive { get; set; }
public string? HttpEndPointIp { get; set; }
public string? HttpEndPointAddress { get; set; }
public int HttpEndPointPort { get; set; }
}

Expand Down
8 changes: 4 additions & 4 deletions src/EventStore.Client/GossipBasedEndpointDiscoverer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ private EndPoint[] ArrangeGossipCandidates(ClusterMessages.MemberInfo[] members)
int j = members.Length;
for (int k = 0; k < members.Length; ++k) {
if (members[k].State == ClusterMessages.VNodeState.Manager)
result[--j] = new DnsEndPoint(members[k].HttpEndPointIp,
result[--j] = new DnsEndPoint(members[k].HttpEndPointAddress,
members[k].HttpEndPointPort);
else
result[++i] = new DnsEndPoint(members[k].HttpEndPointIp,
result[++i] = new DnsEndPoint(members[k].HttpEndPointAddress,
members[k].HttpEndPointPort);
}

Expand Down Expand Up @@ -133,7 +133,7 @@ private static ClusterMessages.ClusterInfo ConvertGrpcClusterInfo(Gossip.Cluster
InstanceId = Uuid.FromDto(x.InstanceId).ToGuid(),
State = (ClusterMessages.VNodeState) x.State,
IsAlive = x.IsAlive,
HttpEndPointIp = x.HttpEndPoint.Address,
HttpEndPointAddress = x.HttpEndPoint.Address,
HttpEndPointPort = (int)x.HttpEndPoint.Port
});
return new ClusterMessages.ClusterInfo { Members = receivedMembers };
Expand Down Expand Up @@ -191,7 +191,7 @@ private static ClusterMessages.ClusterInfo ConvertGrpcClusterInfo(Gossip.Cluster

return node == default(ClusterMessages.MemberInfo)
? null
: new DnsEndPoint(node.HttpEndPointIp, node.HttpEndPointPort);
: new DnsEndPoint(node.HttpEndPointAddress, node.HttpEndPointPort);
}

private bool IsReadOnlyReplicaState(ClusterMessages.VNodeState state) {
Expand Down
30 changes: 15 additions & 15 deletions test/EventStore.Client.Tests/GossipBasedEndpointDiscovererTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public async Task should_issue_gossip_to_gossip_seed() {
new ClusterMessages.MemberInfo {
State = ClusterMessages.VNodeState.Leader,
InstanceId = Guid.NewGuid(),
HttpEndPointIp = IPAddress.Any.ToString(),
HttpEndPointAddress = IPAddress.Any.ToString(),
HttpEndPointPort = 4444,
IsAlive = true,
},
Expand Down Expand Up @@ -62,14 +62,14 @@ public async Task should_be_able_to_discover_twice() {
new ClusterMessages.MemberInfo {
State = ClusterMessages.VNodeState.Leader,
InstanceId = Guid.NewGuid(),
HttpEndPointIp = IPAddress.Any.ToString(),
HttpEndPointAddress = IPAddress.Any.ToString(),
HttpEndPointPort = 1111,
IsAlive = true,
},
new ClusterMessages.MemberInfo {
State = ClusterMessages.VNodeState.Follower,
InstanceId = Guid.NewGuid(),
HttpEndPointIp = IPAddress.Any.ToString(),
HttpEndPointAddress = IPAddress.Any.ToString(),
HttpEndPointPort = 2222,
IsAlive = true,
},
Expand All @@ -80,14 +80,14 @@ public async Task should_be_able_to_discover_twice() {
new ClusterMessages.MemberInfo {
State = ClusterMessages.VNodeState.Leader,
InstanceId = Guid.NewGuid(),
HttpEndPointIp = IPAddress.Any.ToString(),
HttpEndPointAddress = IPAddress.Any.ToString(),
HttpEndPointPort = 1111,
IsAlive = false,
},
new ClusterMessages.MemberInfo {
State = ClusterMessages.VNodeState.Leader,
InstanceId = Guid.NewGuid(),
HttpEndPointIp = IPAddress.Any.ToString(),
HttpEndPointAddress = IPAddress.Any.ToString(),
HttpEndPointPort = 2222,
IsAlive = true,
},
Expand All @@ -113,14 +113,14 @@ public async Task should_be_able_to_discover_twice() {

var expected = firstGossip.Members.First(x => x.HttpEndPointPort == 1111);

Assert.Equal(expected.HttpEndPointIp, result.GetHost());
Assert.Equal(expected.HttpEndPointAddress, result.GetHost());
Assert.Equal(expected.HttpEndPointPort, result.GetPort());

result = await sut.DiscoverAsync();

expected = secondGossip.Members.First(x => x.HttpEndPointPort == 2222);

Assert.Equal(expected.HttpEndPointIp, result.GetHost());
Assert.Equal(expected.HttpEndPointAddress, result.GetHost());
Assert.Equal(expected.HttpEndPointPort, result.GetPort());
}

Expand Down Expand Up @@ -160,7 +160,7 @@ public async Task should_not_be_able_to_pick_invalid_node(ClusterMessages.VNodeS
new ClusterMessages.MemberInfo {
State = invalidState,
InstanceId = Guid.NewGuid(),
HttpEndPointIp = IPAddress.Any.ToString(),
HttpEndPointAddress = IPAddress.Any.ToString(),
HttpEndPointPort = 4444,
IsAlive = true,
},
Expand Down Expand Up @@ -189,14 +189,14 @@ public async Task should_pick_node_based_on_preference(NodePreference preference
new ClusterMessages.MemberInfo {
State = ClusterMessages.VNodeState.Leader,
InstanceId = Guid.NewGuid(),
HttpEndPointIp = IPAddress.Any.ToString(),
HttpEndPointAddress = IPAddress.Any.ToString(),
HttpEndPointPort = 1111,
IsAlive = true,
},
new ClusterMessages.MemberInfo {
State = ClusterMessages.VNodeState.Follower,
InstanceId = Guid.NewGuid(),
HttpEndPointIp = IPAddress.Any.ToString(),
HttpEndPointAddress = IPAddress.Any.ToString(),
HttpEndPointPort = 2222,
IsAlive = true,
},
Expand All @@ -205,14 +205,14 @@ public async Task should_pick_node_based_on_preference(NodePreference preference
? expectedState
: ClusterMessages.VNodeState.ReadOnlyReplica,
InstanceId = Guid.NewGuid(),
HttpEndPointIp = IPAddress.Any.ToString(),
HttpEndPointAddress = IPAddress.Any.ToString(),
HttpEndPointPort = 3333,
IsAlive = true,
},
new ClusterMessages.MemberInfo {
State = ClusterMessages.VNodeState.Manager,
InstanceId = Guid.NewGuid(),
HttpEndPointIp = IPAddress.Any.ToString(),
HttpEndPointAddress = IPAddress.Any.ToString(),
HttpEndPointPort = 4444,
IsAlive = true,
},
Expand All @@ -238,14 +238,14 @@ public async Task falls_back_to_first_alive_node_if_a_preferred_node_is_not_foun
new ClusterMessages.MemberInfo {
State = ClusterMessages.VNodeState.Leader,
InstanceId = Guid.NewGuid(),
HttpEndPointIp = IPAddress.Any.ToString(),
HttpEndPointAddress = IPAddress.Any.ToString(),
HttpEndPointPort = 1111,
IsAlive = false,
},
new ClusterMessages.MemberInfo {
State = ClusterMessages.VNodeState.Follower,
InstanceId = Guid.NewGuid(),
HttpEndPointIp = IPAddress.Any.ToString(),
HttpEndPointAddress = IPAddress.Any.ToString(),
HttpEndPointPort = 2222,
IsAlive = true,
},
Expand Down Expand Up @@ -344,7 +344,7 @@ public override Task<ClusterInfo> Read(Empty request, ServerCallContext context)
State = (MemberInfo.Types.VNodeState)x.State,
IsAlive = x.IsAlive,
HttpEndPoint = new Gossip.EndPoint {
Address = x.HttpEndPointIp,
Address = x.HttpEndPointAddress,
Port = (uint) x.HttpEndPointPort
}
}).ToArray();
Expand Down