Add new ForceMasterFailover() API and sanitize outputs

mythz · mythz · commit d85569459fba · 2015-07-16T13:45:17.000+08:00
diff --git a/src/ServiceStack.Redis/RedisSentinelWorker.cs b/src/ServiceStack.Redis/RedisSentinelWorker.cs
@@ -20,7 +20,9 @@ public RedisSentinelWorker(RedisSentinel sentinel, RedisEndpoint sentinelEndpoin
             this.sentinel = sentinel;
             this.sentinelClient = new RedisClient(sentinelEndpoint) {
                 Db = 0, //Sentinel Servers doesn't support DB, reset to 0
-                ConnectTimeout = sentinel.SentinelWorkerTimeoutMs,
+                ConnectTimeout = sentinel.SentinelWorkerConnectTimeoutMs,
+                ReceiveTimeout = sentinel.SentinelWorkerReceiveTimeoutMs,
+                SendTimeout = sentinel.SentinelWorkerSendTimeoutMs,
             };
 
             if (Log.IsDebugEnabled)
@@ -72,18 +74,21 @@ internal SentinelInfo GetSentinelInfo()
         internal string GetMasterHost(string masterName)
         {
             var masterInfo = sentinelClient.SentinelGetMasterAddrByName(masterName);
-            if (masterInfo.Count > 0)
-            {
-                var ip = masterInfo[0];
-                var port = masterInfo[1];
+            return masterInfo.Count > 0 
+                ? SanitizeMasterConfig(masterInfo) 
+                : null;
+        }
 
-                string aliasIp;
-                if (sentinel.IpAddressMap.TryGetValue(ip, out aliasIp))
-                    ip = aliasIp;
+        private string SanitizeMasterConfig(List<string> masterInfo)
+        {
+            var ip = masterInfo[0];
+            var port = masterInfo[1];
 
-                return "{0}:{1}".Fmt(ip, port);
-            }
-            return null;
+            string aliasIp;
+            if (sentinel.IpAddressMap.TryGetValue(ip, out aliasIp))
+                ip = aliasIp;
+
+            return "{0}:{1}".Fmt(ip, port);
         }
 
         internal List<string> GetSentinelHosts(string masterName)
@@ -152,6 +157,14 @@ public void BeginListeningForConfigurationChanges()
             }
         }
 
+        public string ForceMasterFailover(string masterName)
+        {
+            var masterInfo = this.sentinelClient.SentinelFailover(masterName);
+            return masterInfo.Count > 0
+                ? SanitizeMasterConfig(masterInfo)
+                : null;
+        }
+
         public void Dispose()
         {
             new IDisposable[] { this.sentinelClient, sentinePubSub }.Dispose(Log);
