Add timeout for named pipe connections. Fixes #804

mysql-net · Apr 26, 2020 · dbd9d1e · dbd9d1e
1 parent 00d2090
commit dbd9d1e
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 6 deletions.
diff --git a/src/MySqlConnector/Core/ServerSession.cs b/src/MySqlConnector/Core/ServerSession.cs
@@ -340,7 +340,7 @@ public async Task ConnectAsync(ConnectionSettings cs, int startTickCount, ILoadB
 					else if (cs.ConnectionProtocol == MySqlConnectionProtocol.UnixSocket)
 						connected = await OpenUnixSocketAsync(cs, ioBehavior, cancellationToken).ConfigureAwait(false);
 					else if (cs.ConnectionProtocol == MySqlConnectionProtocol.NamedPipe)
-						connected = await OpenNamedPipeAsync(cs, ioBehavior, cancellationToken).ConfigureAwait(false);
+						connected = await OpenNamedPipeAsync(cs, startTickCount, ioBehavior, cancellationToken).ConfigureAwait(false);
 					if (!connected)
 					{
 						lock (m_lock)
@@ -981,23 +981,35 @@ private async Task<bool> OpenUnixSocketAsync(ConnectionSettings cs, IOBehavior i
 			return false;
 		}
 
-		private Task<bool> OpenNamedPipeAsync(ConnectionSettings cs, IOBehavior ioBehavior, CancellationToken cancellationToken)
+#if NET45 || NETSTANDARD1_3
+#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
+#endif
+		private async Task<bool> OpenNamedPipeAsync(ConnectionSettings cs, int startTickCount, IOBehavior ioBehavior, CancellationToken cancellationToken)
+#if NET45 || NETSTANDARD1_3Co
+#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
+#endif
 		{
 #if NETSTANDARD1_3
 			throw new NotSupportedException("Named pipe connections are not supported in netstandard1.3");
 #else
 			if (Log.IsInfoEnabled())
 				Log.Info("Session{0} connecting to NamedPipe '{1}' on Server '{2}'", m_logArguments[0], cs.PipeName, cs.HostNames![0]);
 			var namedPipeStream = new NamedPipeClientStream(cs.HostNames![0], cs.PipeName, PipeDirection.InOut, PipeOptions.Asynchronous);
+			var timeout = Math.Max(1, cs.ConnectionTimeoutMilliseconds - unchecked(Environment.TickCount - startTickCount));
 			try
 			{
 				using (cancellationToken.Register(() => namedPipeStream.Dispose()))
 				{
 					try
 					{
-						namedPipeStream.Connect();
+#if !NET45
+						if (ioBehavior == IOBehavior.Asynchronous)
+							await namedPipeStream.ConnectAsync(timeout, cancellationToken).ConfigureAwait(false);
+						else
+#endif
+							namedPipeStream.Connect(timeout);
 					}
-					catch (ObjectDisposedException ex) when (cancellationToken.IsCancellationRequested)
+					catch (Exception ex) when ((ex is ObjectDisposedException && cancellationToken.IsCancellationRequested) || ex is TimeoutException)
 					{
 						m_logArguments[1] = cs.PipeName;
 						Log.Info("Session{0} connect timeout expired connecting to named pipe '{1}'", m_logArguments);
@@ -1016,10 +1028,10 @@ private Task<bool> OpenNamedPipeAsync(ConnectionSettings cs, IOBehavior ioBehavi
 
 				lock (m_lock)
 					m_state = State.Connected;
-				return Task.FromResult(true);
+				return true;
 			}
 
-			return Task.FromResult(false);
+			return false;
 #endif
 		}
 

diff --git a/tests/SideBySide/ConnectSync.cs b/tests/SideBySide/ConnectSync.cs
@@ -123,6 +123,36 @@ public void LoadBalanceNotSupported(string connectionString)
 		}
 #endif
 
+#if !NETCOREAPP1_1_2
+		[Fact]
+		public void NonExistentPipe()
+		{
+			var csb = new MySqlConnectionStringBuilder
+			{
+				PipeName = "nonexistingpipe",
+				ConnectionProtocol = MySqlConnectionProtocol.NamedPipe,
+				Server = ".",
+				ConnectionTimeout = 1
+			};
+
+			var sw = Stopwatch.StartNew();
+			using var connection = new MySqlConnection(csb.ConnectionString);
+			try
+			{
+				connection.Open();
+				Assert.False(true);
+			}
+			catch (MySqlException)
+			{
+			}
+#if !BASELINE
+			TestUtilities.AssertDuration(sw, 900, 500);
+#else
+			TestUtilities.AssertDuration(sw, 0, 500);
+#endif
+		}
+#endif
+
 		[Theory]
 		[InlineData(false, false)]
 		[InlineData(true, false)]