Merge branch 'master' of github.com:StackExchange/StackExchange.Redis into core-rtm

Docs/Timeouts.md

@@ -45,8 +45,8 @@ Given the above information, it's recommend to set the minimum configuration val
 
 How to configure this setting:
 
- - In ASP.NET, use the ["minIoThreads" configuration setting](https://msdn.microsoft.com/en-us/library/vstudio/7w2sway1(v=vs.100).aspx) under the `<processModel>` configuration element in web.config.  You should be able to set this programmatically (see below) from your Application_Start method in global.asax.cs.
+ - In ASP.NET, use the ["minIoThreads" configuration setting](https://msdn.microsoft.com/en-us/library/vstudio/7w2sway1(v=vs.100).aspx) under the `<processModel>` configuration element in machine.config. If you are running inside of Azure WebSites, this setting is not exposed through the configuration options. You should be able to set this programmatically (see below) from your Application_Start method in global.asax.cs.
 
 > **Important Note:** the value specified in this configuration element is a *per-core* setting.  For example, if you have a 4 core machine and want your minIOThreads setting to be 200 at runtime, you would use `<processModel minIoThreads="50"/>`.
 
- - Outside of ASP.NET, use the [ThreadPool.SetMinThreads(…)](https://msdn.microsoft.com//en-us/library/system.threading.threadpool.setminthreads(v=vs.100).aspx) API.
\ No newline at end of file
+ - Outside of ASP.NET, use the [ThreadPool.SetMinThreads(…)](https://msdn.microsoft.com//en-us/library/system.threading.threadpool.setminthreads(v=vs.100).aspx) API.

StackExchange.Redis.StrongName.nuspec

@@ -15,7 +15,7 @@
 
     <dependencies>
       <group targetFramework="net40">
-        <dependency id="Microsoft.Bcl" version="1.1.9"/>
+        <dependency id="Microsoft.Bcl" version="1.1.10"/> 
         <dependency id="Microsoft.Bcl.Async" version="1.0.168"/>
       </group>
       <group targetFramework="net45">

StackExchange.Redis/StackExchange/Redis/RedisResult.cs

@@ -7,6 +7,14 @@ namespace StackExchange.Redis
     /// </summary>
     public abstract class RedisResult
     {
+        /// <summary>
+        /// Create a new RedisResult.
+        /// </summary>
+        /// <returns></returns>
+        public static RedisResult Create(RedisValue value)
+        {
+            return new SingleRedisResult(value);
+        }
 
         // internally, this is very similar to RawResult, except it is designed to be usable
         // outside of the IO-processing pipeline: the buffers are standalone, etc

StackExchange.Redis/StackExchange/Redis/RedisSubscriber.cs

@@ -185,7 +185,7 @@ public bool Remove(Action<RedisChannel, RedisValue> value)
             public Task SubscribeToServer(ConnectionMultiplexer multiplexer, RedisChannel channel, CommandFlags flags, object asyncState, bool internalCall)
             {
                 var cmd = channel.IsPatternBased ? RedisCommand.PSUBSCRIBE : RedisCommand.SUBSCRIBE;
-                var selected = multiplexer.SelectServer(-1, cmd, CommandFlags.DemandMaster, default(RedisKey));
+                var selected = multiplexer.SelectServer(-1, cmd, flags, default(RedisKey));
 
                 if (selected == null || Interlocked.CompareExchange(ref owner, selected, null) != null) return null;
 

StackExchange.Redis/StackExchange/Redis/ResultProcessor.cs

@@ -140,7 +140,8 @@ public virtual bool SetResult(PhysicalConnection connection, Message message, Ra
                 var bridge = connection.Bridge;
                 var server = bridge.ServerEndPoint;
                 bool log = !message.IsInternalCall;
-                bool isMoved = result.AssertStarts(MOVED);
+                bool isMoved = result.AssertStarts(MOVED);
+                string err = string.Empty;
                 if (isMoved || result.AssertStarts(ASK))
                 {
                     message.SetResponseReceived();
@@ -151,21 +152,29 @@ public virtual bool SetResult(PhysicalConnection connection, Message message, Ra
                     EndPoint endpoint;
                     if (Format.TryParseInt32(parts[1], out hashSlot) &&
                         (endpoint = Format.TryParseEndPoint(parts[2])) != null)
-                    {
+                    {
                         
                         // no point sending back to same server, and no point sending to a dead server
                         if (!Equals(server.EndPoint, endpoint))
-                        {
-                            if (bridge.Multiplexer.TryResend(hashSlot, message, endpoint, isMoved))
-                            {
-                                connection.Multiplexer.Trace(message.Command + " re-issued to " + endpoint, isMoved ? "MOVED" : "ASK");
-                                return false;
+                        {
+                            if (bridge.Multiplexer.TryResend(hashSlot, message, endpoint, isMoved))
+                            {
+                                connection.Multiplexer.Trace(message.Command + " re-issued to " + endpoint, isMoved ? "MOVED" : "ASK");
+                                return false;
+                            }
+                            else
+                            {
+                                err = string.Format("Endpoint {0} serving hashslot {1} is not reachable at this point of time. Please check connectTimeout value. If it is low, try increasing it to give the ConnectionMultiplexer a chance to recover from the network disconnect.", endpoint, hashSlot);
                             }
                         }
                     }
+                }
+
+                if (string.IsNullOrWhiteSpace(err))
+                {
+                    err = result.GetString();
                 }
-
-                string err = result.GetString();
+                
                 if (log)
                 {
                     bridge.Multiplexer.OnErrorMessage(server.EndPoint, err);

StackExchange.Redis/StackExchange/Redis/ServerEndPoint.cs

@@ -101,7 +101,8 @@ internal Exception LastException
                 //check if subscription endpoint has a better lastexception
                 if (tmp2 != null && tmp2.LastException != null)
                 {
-                    if (!tmp2.LastException.Data["Redis-FailureType"].ToString().Equals(ConnectionFailureType.UnableToConnect.ToString()))
+                    var failureType = tmp2.LastException.Data["Redis-FailureType"];
+                    if (failureType != null && !failureType.ToString().Equals(ConnectionFailureType.UnableToConnect.ToString()))
                     {
                         return tmp2.LastException;
                     }