Add error/host details to OperationTimedOut

thobbs · thobbs · commit 4698155981e3 · 2014-02-18T16:15:47.000-06:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -19,6 +19,7 @@ Other
 * Skip sending OPTIONS message on connection creation if compression is
   disabled or not available and a CQL version has not been explicitly
   set
+* Add details about errors and the last queried host to ``OperationTimedOut``
 
 1.0.0 Final
 ===========
diff --git a/cassandra/__init__.py b/cassandra/__init__.py
@@ -226,4 +226,19 @@ class OperationTimedOut(Exception):
     to complete.  This is not an error generated by Cassandra, only
     the driver.
     """
-    pass
+
+    errors = None
+    """
+    A dict of errors keyed by the :class:`~.Host` against which they occurred.
+    """
+
+    last_host = None
+    """
+    The last :class:`~.Host` this operation was attempted against.
+    """
+
+    def __init__(self, errors=None, last_host=None):
+        self.errors = errors
+        self.last_host = last_host
+        message = "errors=%s, last_host=%s" % (self.errors, self.last_host)
+        Exception.__init__(self, message)
diff --git a/cassandra/cluster.py b/cassandra/cluster.py
@@ -852,8 +852,8 @@ def _prepare_all_queries(self, host):
                                       "statement on host %s: %r", host, response)
 
             log.debug("Done preparing all known prepared statements against host %s", host)
-        except OperationTimedOut:
-            log.warn("Timed out trying to prepare all statements on host %s", host)
+        except OperationTimedOut as timeout:
+            log.warn("Timed out trying to prepare all statements on host %s: %s", host, timeout)
         except (ConnectionException, socket.error) as exc:
             log.warn("Error trying to prepare all statements on host %s: %r", host, exc)
         except Exception:
@@ -1644,8 +1644,9 @@ def wait_for_schema_agreement(self, connection=None):
                     timeout = min(2.0, total_timeout - elapsed)
                     peers_result, local_result = connection.wait_for_responses(
                         peers_query, local_query, timeout=timeout)
-                except OperationTimedOut:
-                    log.debug("[control connection] Timed out waiting for response during schema agreement check")
+                except OperationTimedOut as timeout:
+                    log.debug("[control connection] Timed out waiting for " \
+                              "response during schema agreement check: %s", timeout)
                     elapsed = self._time.time() - start
                     continue
 
@@ -2189,7 +2190,7 @@ def result(self, timeout=_NOT_SET):
             elif self._final_exception:
                 raise self._final_exception
             else:
-                raise OperationTimedOut()
+                raise OperationTimedOut(errors=self._errors, last_host=self._current_host)
 
     def get_query_trace(self, max_wait=None):
         """
