merge bug26133 into default

Author: michaelklishin

projects/client/RabbitMQ.Client/src/client/api/ConnectionFactory.cs

@@ -203,118 +203,24 @@ public String Uri
         ///their respective defaults.</summary>
         public ConnectionFactory() { }
 
-        protected virtual IConnection FollowRedirectChain
-            (int maxRedirects,
-             IDictionary<AmqpTcpEndpoint, int> connectionAttempts,
-             IDictionary<AmqpTcpEndpoint, Exception> connectionErrors,
-             ref AmqpTcpEndpoint[] mostRecentKnownHosts,
-             AmqpTcpEndpoint endpoint)
-        {
-            AmqpTcpEndpoint candidate = endpoint;
-            try {
-                while (true) {
-                    int attemptCount =
-                        connectionAttempts.ContainsKey(candidate)
-                        ? (int) connectionAttempts[candidate]
-                        : 0;
-                    connectionAttempts[candidate] = attemptCount + 1;
-                    bool insist = attemptCount >= maxRedirects;
-
-                    IProtocol p = Protocol;
-                    IFrameHandler fh = p.CreateFrameHandler(candidate,
-                                                            SocketFactory,
-                                                            RequestedConnectionTimeout);
-
-                    // At this point, we may be able to create
-                    // and fully open a successful connection,
-                    // in which case we're done, and the
-                    // connection should be returned.
-                    return p.CreateConnection(this, insist, fh);
-                }
-            } catch (Exception e) {
-                connectionErrors[candidate] = e;
-                return null;
-            }
-        }
-
-        protected virtual IConnection CreateConnection(int maxRedirects,
-                                                       IDictionary<AmqpTcpEndpoint, int> connectionAttempts,
-                                                       IDictionary<AmqpTcpEndpoint, Exception> connectionErrors,
-                                                       params AmqpTcpEndpoint[] endpoints)
+        ///<summary>Create a connection to the specified endpoint.</summary>
+        public virtual IConnection CreateConnection()
         {
-            foreach (AmqpTcpEndpoint endpoint in endpoints)
+            IConnection conn = null;
+            try
+            {
+                IProtocol p = Protocols.DefaultProtocol;
+                IFrameHandler fh = p.CreateFrameHandler(Endpoint,
+                                                        SocketFactory,
+                                                        RequestedConnectionTimeout);
+                conn = p.CreateConnection(this, false, fh);
+            } catch (Exception e)
             {
-                AmqpTcpEndpoint[] mostRecentKnownHosts = new AmqpTcpEndpoint[0];
-                // ^^ holds a list of known-hosts that came back with
-                // a connection.redirect. If, once we reach the end of
-                // a chain of redirects, we still haven't managed to
-                // get a usable connection, we recurse on
-                // mostRecentKnownHosts, trying each of those in
-                // turn. Finally, if neither the initial
-                // chain-of-redirects for the current endpoint, nor
-                // the chains-of-redirects for each of the
-                // mostRecentKnownHosts gives us a usable connection,
-                // we give up on this particular endpoint, and
-                // continue with the foreach loop, trying the
-                // remainder of the array we were given.
-                IConnection conn = FollowRedirectChain(maxRedirects,
-                                                       connectionAttempts,
-                                                       connectionErrors,
-                                                       ref mostRecentKnownHosts,
-                                                       endpoint);
-                if (conn != null) {
-                    return conn;
-                }
-
-                // Connection to this endpoint failed at some point
-                // down the redirection chain - either the first
-                // entry, or one of the re.Host values from subsequent
-                // RedirectExceptions. We recurse into
-                // mostRecentKnownHosts, to see if one of those is
-                // suitable.
-                if (mostRecentKnownHosts.Length > 0) {
-                    // Only bother recursing if we know of some
-                    // hosts. If we were to recurse with no endpoints
-                    // in the array, we'd stomp on
-                    // mostRecentException, which makes debugging
-                    // connectivity problems needlessly more
-                    // difficult.
-                    conn = CreateConnection(maxRedirects,
-                                            connectionAttempts,
-                                            connectionErrors,
-                                            mostRecentKnownHosts);
-                    if (conn != null) {
-                        return conn;
-                    }
-                }
-            }
-            return null;
-        }
 
-        ///<summary>Create a connection to the first available
-        ///endpoint in the list provided. Up to a maximum of
-        ///maxRedirects broker-originated redirects are permitted for
-        ///each endpoint tried.</summary>
-        public virtual IConnection CreateConnection(int maxRedirects)
-        {
-            IDictionary<AmqpTcpEndpoint, int> connectionAttempts = new Dictionary<AmqpTcpEndpoint, int>();
-            Dictionary<AmqpTcpEndpoint, Exception> connectionErrors = new Dictionary<AmqpTcpEndpoint, Exception>();
-            IConnection conn = CreateConnection(maxRedirects,
-                                                connectionAttempts,
-                                                connectionErrors,
-                                                new AmqpTcpEndpoint[]{Endpoint});
-            if (conn != null) {
-                return conn;
+                throw new BrokerUnreachableException(e);
             }
-            Exception Inner = connectionErrors[Endpoint] as Exception;
-            throw new BrokerUnreachableException(connectionAttempts, connectionErrors, Inner);
-        }
 
-        ///<summary>Create a connection to the specified endpoint
-        ///No broker-originated redirects are permitted.</summary>
-        public virtual IConnection CreateConnection()
-        {
-            return CreateConnection(0);
+            return conn;
         }
 
         ///<summary>Given a list of mechanism names supported by the

projects/client/RabbitMQ.Client/src/client/api/IModel.cs

@@ -928,13 +928,6 @@ void _Private_ConnectionOpen(string virtualHost,
         void HandleConnectionOpenOk([AmqpFieldMapping("RabbitMQ.Client.Framing.v0_9_1", "reserved1")]
                                     string knownHosts);
 
-        ///<summary>Handle an incoming Connection.Redirect.
-        /// (not available in AMQP 0-9-1)
-        ///</summary>
-        [AmqpMethodDoNotImplement("RabbitMQ.Client.Framing.v0_9_1")]
-        void HandleConnectionRedirect(string host,
-                                      string knownHosts);
-
         ///<summary>Used to send a Connection.Close. Called during
         ///connection shutdown.</summary>
         [AmqpMethodMapping(null, "connection", "close")]

projects/client/RabbitMQ.Client/src/client/exceptions/BrokerUnreachableException.cs

@@ -48,61 +48,11 @@ namespace RabbitMQ.Client.Exceptions {
 
     ///<summary>Thrown when no connection could be opened during a
     ///ConnectionFactory.CreateConnection attempt.</summary>
-    ///<remarks>
-    /// CreateConnection (optionally) handles redirections, so even a
-    /// single-endpoint connection attempt may end up attempting to
-    /// connect to multiple TCP endpoints. This exception contains
-    /// information on how many times each endpoint was tried, and the
-    /// outcome of the most recent attempt against each endpoint. See
-    /// the ConnectionAttempts and ConnectionErrors properties.
-    ///</remarks>
     public class BrokerUnreachableException: IOException
     {
-        private IDictionary<AmqpTcpEndpoint, int> m_connectionAttempts;
-        private IDictionary<AmqpTcpEndpoint, Exception> m_connectionErrors;
-
-        ///<summary>A map from AmqpTcpEndpoint to int, counting the
-        ///number of attempts that were made against each
-        ///endpoint.</summary>
-        public IDictionary<AmqpTcpEndpoint, int> ConnectionAttempts { get { return m_connectionAttempts; } }
-
-        ///<summary>A map from AmqpTcpEndpoint to Exception, recording
-        ///the outcome of the most recent connection attempt against
-        ///each endpoint.</summary>
-        public IDictionary<AmqpTcpEndpoint, Exception> ConnectionErrors { get { return m_connectionErrors; } }
-
-        ///<summary>same as ConnectionErrors property</summary>
-        public override IDictionary Data { get { return new Dictionary<AmqpTcpEndpoint, Exception>(m_connectionErrors); } }
-
-        ///<summary>Construct a BrokerUnreachableException. Expects
-        ///maps as per the description of the ConnectionAttempts and
-        ///ConnectionErrors properties. The inner exception is associated
+        ///<summary>Construct a BrokerUnreachableException. The inner exception is associated
         ///with only one connection attempt.</summary>
-        public BrokerUnreachableException(IDictionary<AmqpTcpEndpoint, int> connectionAttempts,
-                                          IDictionary<AmqpTcpEndpoint, Exception> connectionErrors,
-                                          Exception Inner)
-            : base("None of the specified endpoints were reachable", Inner)
-        {
-            m_connectionAttempts = connectionAttempts;
-            m_connectionErrors = connectionErrors;
-        }
-
-        ///<summary>Provide a full description of the various
-        ///connection attempts that were made, as well as the usual
-        ///Exception stack trace.</summary>
-        public override string ToString() {
-            StringBuilder sb = new StringBuilder(base.Message);
-            sb.Append("\nEndpoints attempted:\n");
-            foreach (KeyValuePair<AmqpTcpEndpoint, int> entry in m_connectionAttempts) {
-                sb.Append("------------------------------------------------\n");
-                sb.Append("endpoint=").Append(entry.Key);
-                sb.Append(", attempts=").Append(entry.Value).Append("\n");
-                sb.Append(m_connectionErrors[entry.Key] as Exception);
-            }
-            sb.Append("\n================================================\n");
-            sb.Append("Stack trace:\n");
-            sb.Append(base.StackTrace);
-            return sb.ToString();
-        }
+        public BrokerUnreachableException(Exception Inner)
+            : base("None of the specified endpoints were reachable", Inner) {}
     }
 }

projects/client/RabbitMQ.Client/src/client/impl/ModelBase.cs

@@ -1507,16 +1507,6 @@ public void HandleConnectionOpenOk(string knownHosts)
             k.HandleCommand(null); // release the continuation.
         }
 
-        public void HandleConnectionRedirect(string host,
-                                             string knownHosts)
-        {
-            ConnectionOpenContinuation k = (ConnectionOpenContinuation)m_continuationQueue.Next();
-            k.m_redirect = true;
-            k.m_host = host;
-            k.m_knownHosts = knownHosts;
-            k.HandleCommand(null); // release the continuation.
-        }
-
         public abstract void _Private_ConnectionClose(ushort replyCode,
                                                       string replyText,
                                                       ushort classId,

projects/client/Unit/src/unit/TestAuth.cs

@@ -70,11 +70,7 @@ public void TestAuthFailure()
             }
             catch (BrokerUnreachableException bue)
             {
-                foreach (Object failureReason in bue.ConnectionErrors.Values)
-                {
-                    Assert.IsInstanceOf<AuthenticationFailureException>(
-                        failureReason);
-                }
+                Assert.IsInstanceOf<AuthenticationFailureException>(bue.InnerException);
             }
         }
     }