From 68c1bc79ac77a281dc057650044be16106a1f4dd Mon Sep 17 00:00:00 2001 From: Ugo Lattanzi Date: Wed, 17 Jun 2020 08:23:32 +0200 Subject: [PATCH] Changed IsSlave with IsReplica --- Directory.Build.props | 2 +- .../Configuration/RedisConfiguration.cs | 1 - .../Implementations/RedisDatabase.cs | 2 +- .../ServerIteration/ServerEnumerable.cs | 3 ++- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index aee3778c..b026b649 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,7 +4,7 @@ Ugo Lattanzi - 6.2.2 + 6.3.0 netstandard2.0;net461;net472;netcoreapp3.0;netcoreapp3.1 True diff --git a/src/core/StackExchange.Redis.Extensions.Core/Configuration/RedisConfiguration.cs b/src/core/StackExchange.Redis.Extensions.Core/Configuration/RedisConfiguration.cs index d79b654b..587030c5 100644 --- a/src/core/StackExchange.Redis.Extensions.Core/Configuration/RedisConfiguration.cs +++ b/src/core/StackExchange.Redis.Extensions.Core/Configuration/RedisConfiguration.cs @@ -288,7 +288,6 @@ public ConfigurationOptions ConfigurationOptions AbortOnConnectFail = AbortOnConnectFail, ConfigurationChannel = ConfigurationChannel, ChannelPrefix = KeyPrefix, - ConnectRetry = 0, }; if (IsSentinelCluster) diff --git a/src/core/StackExchange.Redis.Extensions.Core/Implementations/RedisDatabase.cs b/src/core/StackExchange.Redis.Extensions.Core/Implementations/RedisDatabase.cs index 14106c22..4d8dbb58 100644 --- a/src/core/StackExchange.Redis.Extensions.Core/Implementations/RedisDatabase.cs +++ b/src/core/StackExchange.Redis.Extensions.Core/Implementations/RedisDatabase.cs @@ -412,7 +412,7 @@ public Task FlushDbAsync() { var server = Database.Multiplexer.GetServer(endPoints[i]); - if (!server.IsSlave) + if (!server.IsReplica) tasks.Add(server.FlushDatabaseAsync(Database.Database)); } diff --git a/src/core/StackExchange.Redis.Extensions.Core/ServerIteration/ServerEnumerable.cs b/src/core/StackExchange.Redis.Extensions.Core/ServerIteration/ServerEnumerable.cs index 805a829f..b454cabc 100644 --- a/src/core/StackExchange.Redis.Extensions.Core/ServerIteration/ServerEnumerable.cs +++ b/src/core/StackExchange.Redis.Extensions.Core/ServerIteration/ServerEnumerable.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using System.Net; + using StackExchange.Redis.Extensions.Core.Configuration; namespace StackExchange.Redis.Extensions.Core.ServerIteration @@ -41,7 +42,7 @@ public IEnumerator GetEnumerator() var server = multiplexer.GetServer(endPoint); if (targetRole == ServerEnumerationStrategy.TargetRoleOptions.PreferSlave) { - if (!server.IsSlave) + if (!server.IsReplica) continue; }