r11508: 25 Jan 2007 Kevin Rosenberg <kevin@rosenberg.net>

        * sql/pool.lisp: Test pooled connection when popped from
        the pool to ensure the connection still works. Currently, implemented
        only for MySQL.

diff --git a/ChangeLog b/ChangeLog
index 9e5fe340c098c9c17d531ec2d24e56d69ce480b2..516540a6b344335e2c767d0b286192359f1bc98f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+25 Jan 2007  Kevin Rosenberg <kevin@rosenberg.net>
+       * sql/pool.lisp: Test pooled connection when popped from
+       the pool to ensure the connection still works. Currently, implemented
+       only for MySQL.
+
 17 Jan 2007  Kevin Rosenberg <kevin@rosenberg.net>
        * db-mysql/Makefile: Add potential mysql directories
 

diff --git a/clsql.asd b/clsql.asd
index 20f29d5b43abf1b26151270d162116c7ba327c7a..35e172ac40ef9440ed3037b4c60af5a4b589f638 100644 (file)
--- a/clsql.asd
+++ b/clsql.asd
@@ -60,7 +60,7 @@ oriented interface."
                         ((:file "initialize")
                         (:file "database" :depends-on ("initialize"))
                         (:file "recording" :depends-on ("database"))
-                        (:file "pool"))
+                        (:file "pool" :depends-on ("database")))
                         :depends-on (base))
               (:module syntax
                        :pathname ""

diff --git a/sql/pool.lisp b/sql/pool.lisp
index 6791a6e272368ad232d2318856248b743d74cd98..f6c6c40a2bf06dac25895552e67bd38ea49d57cf 100644 (file)
--- a/sql/pool.lisp
+++ b/sql/pool.lisp
@@ -33,8 +33,28 @@
 
 (defun acquire-from-conn-pool (pool)
   (or (with-process-lock ((conn-pool-lock pool) "Acquire from pool")
-       (and (plusp (length (free-connections pool)))
-            (vector-pop (free-connections pool))))
+       (when (plusp (length (free-connections pool)))
+          (let ((pconn (vector-pop (free-connections pool))))
+            ;; test if connection still valid.
+            ;; Currently, on supported on MySQL
+            (cond
+              ((eq :mysql (database-type pconn))
+               (handler-case
+                   (database-query "SHOW ERRORS LIMIT 1" pconn nil nil)
+                 (error (e)
+                   ;; we could check for error type 2006 for "SERVER GONE AWAY",
+                   ;; but, it's safer just to disconnect the pooled conn for any error
+                   (warn "Database connection ~S had an error when attempted to be acquired from the pool:
+  ~S
+Disconnecting.~%"
+                         pconn e)
+                   (disconnect :database pconn :error nil)
+                   nil)
+                 (:no-error (res)
+                   (declare (ignore res))
+                   pconn)))
+              (t
+               pconn)))))
       (let ((conn (connect (connection-spec pool)
                           :database-type (pool-database-type pool)
                           :if-exists :new