Commit b56e707a authored by mgravell's avatar mgravell

fix naming of SentinelGetSentinelAddressesAsync

parent a01cd041
...@@ -2423,7 +2423,7 @@ internal void UpdateSentinelAddressList(string serviceName, int timeoutmillis = ...@@ -2423,7 +2423,7 @@ internal void UpdateSentinelAddressList(string serviceName, int timeoutmillis =
{ {
Task<EndPoint[]>[] sentinels = GetServerSnapshot().ToArray() Task<EndPoint[]>[] sentinels = GetServerSnapshot().ToArray()
.Where(s => s.ServerType == ServerType.Sentinel) .Where(s => s.ServerType == ServerType.Sentinel)
.Select(s => GetServer(s.EndPoint).SentinelGetSentinelAddresses(serviceName)) .Select(s => GetServer(s.EndPoint).SentinelGetSentinelAddressesAsync(serviceName))
.ToArray(); .ToArray();
Task<Task<EndPoint[]>> firstCompleteRequest = WaitFirstNonNullIgnoreErrorsAsync(sentinels); Task<Task<EndPoint[]>> firstCompleteRequest = WaitFirstNonNullIgnoreErrorsAsync(sentinels);
......
...@@ -759,7 +759,16 @@ public partial interface IServer : IRedis ...@@ -759,7 +759,16 @@ public partial interface IServer : IRedis
/// <param name="serviveName">the sentinel service name</param> /// <param name="serviveName">the sentinel service name</param>
/// <param name="flags"></param> /// <param name="flags"></param>
/// <returns>a list of the sentinel ips and ports</returns> /// <returns>a list of the sentinel ips and ports</returns>
Task<EndPoint[]> SentinelGetSentinelAddresses(string serviveName, CommandFlags flags = CommandFlags.None); EndPoint[] SentinelGetSentinelAddresses(string serviveName, CommandFlags flags = CommandFlags.None);
/// <summary>
/// Returns the ip and port numbers of all known Sentinels
/// for the given service name.
/// </summary>
/// <param name="serviveName">the sentinel service name</param>
/// <param name="flags"></param>
/// <returns>a list of the sentinel ips and ports</returns>
Task<EndPoint[]> SentinelGetSentinelAddressesAsync(string serviveName, CommandFlags flags = CommandFlags.None);
/// <summary> /// <summary>
/// Show the state and info of the specified master. /// Show the state and info of the specified master.
......
...@@ -807,7 +807,13 @@ public Task<EndPoint> SentinelGetMasterAddressByNameAsync(string serviceName, Co ...@@ -807,7 +807,13 @@ public Task<EndPoint> SentinelGetMasterAddressByNameAsync(string serviceName, Co
return ExecuteAsync(msg, ResultProcessor.SentinelMasterEndpoint); return ExecuteAsync(msg, ResultProcessor.SentinelMasterEndpoint);
} }
public Task<EndPoint[]> SentinelGetSentinelAddresses(string serviceName, CommandFlags flags = CommandFlags.None) public EndPoint[] SentinelGetSentinelAddresses(string serviceName, CommandFlags flags = CommandFlags.None)
{
var msg = Message.Create(-1, flags, RedisCommand.SENTINEL, RedisLiterals.SENTINELS, (RedisValue)serviceName);
return ExecuteSync(msg, ResultProcessor.SentinelAddressesEndPoints);
}
public Task<EndPoint[]> SentinelGetSentinelAddressesAsync(string serviceName, CommandFlags flags = CommandFlags.None)
{ {
var msg = Message.Create(-1, flags, RedisCommand.SENTINEL, RedisLiterals.SENTINELS, (RedisValue)serviceName); var msg = Message.Create(-1, flags, RedisCommand.SENTINEL, RedisLiterals.SENTINELS, (RedisValue)serviceName);
return ExecuteAsync(msg, ResultProcessor.SentinelAddressesEndPoints); return ExecuteAsync(msg, ResultProcessor.SentinelAddressesEndPoints);
......
...@@ -562,15 +562,15 @@ public async Task GetSentinelMasterConnectionWriteReadFailover() ...@@ -562,15 +562,15 @@ public async Task GetSentinelMasterConnectionWriteReadFailover()
[Fact] [Fact]
public async Task SentinelGetSentinelAddressesTest() public async Task SentinelGetSentinelAddressesTest()
{ {
var addresses = await SentinelServerA.SentinelGetSentinelAddresses(ServiceName).ForAwait(); var addresses = await SentinelServerA.SentinelGetSentinelAddressesAsync(ServiceName).ForAwait();
Assert.Contains(SentinelServerB.EndPoint, addresses); Assert.Contains(SentinelServerB.EndPoint, addresses);
Assert.Contains(SentinelServerC.EndPoint, addresses); Assert.Contains(SentinelServerC.EndPoint, addresses);
addresses = await SentinelServerB.SentinelGetSentinelAddresses(ServiceName).ForAwait(); addresses = await SentinelServerB.SentinelGetSentinelAddressesAsync(ServiceName).ForAwait();
Assert.Contains(SentinelServerA.EndPoint, addresses); Assert.Contains(SentinelServerA.EndPoint, addresses);
Assert.Contains(SentinelServerC.EndPoint, addresses); Assert.Contains(SentinelServerC.EndPoint, addresses);
addresses = await SentinelServerC.SentinelGetSentinelAddresses(ServiceName).ForAwait(); addresses = await SentinelServerC.SentinelGetSentinelAddressesAsync(ServiceName).ForAwait();
Assert.Contains(SentinelServerA.EndPoint, addresses); Assert.Contains(SentinelServerA.EndPoint, addresses);
Assert.Contains(SentinelServerB.EndPoint, addresses); Assert.Contains(SentinelServerB.EndPoint, addresses);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment