[fix] stdlib: Quick fix for dead connection problem.

gaetan-sumup · Feb 13, 2012 · 864899f · 864899f
1 parent ad5eb18
commit 864899f
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 5 deletions.
diff --git a/stdlib/apis/mongo/bson.opa b/stdlib/apis/mongo/bson.opa
@@ -15,6 +15,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with OPA.  If not, see <http://www.gnu.org/licenses/>.
 */
+package stdlib.apis.mongo
 
 /**
  * Bson support for MongoDB driver
@@ -39,8 +40,6 @@
 
 import stdlib.core.{date,map}
 
-package stdlib.apis.mongo
-
 /**
  * Some convenience types.
  * To use these, just cast the OPA type to this type, for example,

diff --git a/stdlib/apis/mongo/collection.opa b/stdlib/apis/mongo/collection.opa
@@ -15,6 +15,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with OPA.  If not, see <http://www.gnu.org/licenses/>.
 */
+package stdlib.apis.mongo
 
 /**
  * MongoDB binding for OPA.

diff --git a/stdlib/apis/mongo/commands.opa b/stdlib/apis/mongo/commands.opa
@@ -15,6 +15,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with OPA.  If not, see <http://www.gnu.org/licenses/>.
 */
+package stdlib.apis.mongo
 
 /**
  * MongoDB binding for OPA.

diff --git a/stdlib/apis/mongo/common.opa b/stdlib/apis/mongo/common.opa
@@ -15,6 +15,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with OPA.  If not, see <http://www.gnu.org/licenses/>.
 */
+package stdlib.apis.mongo
 
 /**
  * MongoDB binding for OPA.

diff --git a/stdlib/apis/mongo/connection.opa b/stdlib/apis/mongo/connection.opa
@@ -15,6 +15,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with OPA.  If not, see <http://www.gnu.org/licenses/>.
 */
+package stdlib.apis.mongo
 
 /**
  * MongoDB binding for OPA.

diff --git a/stdlib/apis/mongo/cursor.opa b/stdlib/apis/mongo/cursor.opa
@@ -15,6 +15,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with OPA.  If not, see <http://www.gnu.org/licenses/>.
 */
+package stdlib.apis.mongo
 
 /**
  * MongoDB binding for OPA.

diff --git a/stdlib/apis/mongo/dbMongo.opa b/stdlib/apis/mongo/dbMongo.opa
@@ -16,6 +16,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with OPA.  If not, see <http://www.gnu.org/licenses/>.
 */
+package stdlib.apis.mongo
 
 import stdlib.core.map
 import stdlib.system

diff --git a/stdlib/apis/mongo/log.opa b/stdlib/apis/mongo/log.opa
@@ -15,6 +15,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with OPA.  If not, see <http://www.gnu.org/licenses/>.
 */
+package stdlib.apis.mongo
 
 /**
  * Logging support for MongoDB driver

diff --git a/stdlib/apis/mongo/mongo.opa b/stdlib/apis/mongo/mongo.opa
@@ -15,6 +15,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with OPA.  If not, see <http://www.gnu.org/licenses/>.
 */
+package stdlib.apis.mongo
 
 /**
  * MongoDB binding for OPA.
@@ -88,6 +89,7 @@ type Mongo.srr =
   / {snderrresult:option(Mongo.reply)}
   / {stopresult}
   / {reconnect}
+  / {noconnection}
 
 /** Messages for socket pool **/
 @private type Mongo.reconnectmsg = {reconnect:(string,Mongo.db)} / {stop}
@@ -192,6 +194,7 @@ MongoDriver = {{
    */
   @private
   doreconnect(from:string, m:Mongo.db): bool =
+    do if m.log then ML.debug("MongoDriver.doreconnect","depth={m.depth}",void)
     if m.depth > m.max_depth
     then
       do if m.log then ML.error("MongoDriver.reconnect({from})","max depth exceeded",void)
@@ -224,9 +227,10 @@ MongoDriver = {{
 
   @private
   reconnect(from, m) =
+    do if m.log then ML.debug("MongoDriver.reconnect","m={m}",void)
     match (Cell.call(m.reconncell,({reconnect=((from,m))}:Mongo.reconnectmsg)):Mongo.reconnectresult) with
     | {reconnectresult=tf} -> tf
-    | _ -> @fail
+    | _ -> do ML.debug("MongoDriver.reconnect","fail",void) @fail
 
   @private
   stoprecon(m) =
@@ -349,12 +353,14 @@ MongoDriver = {{
           | {send=(m,mbuf,name)} -> sr_snr({m with ~conn},mbuf,name)
           | {sendrecv=(m,mbuf,name)} -> sr_swr({m with ~conn},mbuf,name)
           | {senderror=(m,mbuf,name,ns)} -> sr_swe({m with ~conn},mbuf,name,ns)
-          | {stop} -> @fail)
+          | {stop} -> do ML.debug("MongoDriver.srpool","stop",void) @fail)
        do SocketPool.release(m.pool,connection)
        result
     | {~failure} ->
        do if m.log then ML.error("MongoDriver.srpool","Can't get pool {C.string_of_failure(failure)}",void)
-       {reconnect}
+       if (failure == {Error="Got exception Scheduler.Connection_closed"})
+       then {noconnection}
+       else {reconnect}
 
   @private
   snd(m,mbuf,name) =
@@ -367,6 +373,7 @@ MongoDriver = {{
       else ML.fatal("MongoDriver.snd({name}):","comms error (Can't reconnect)",-1)
     srr = srpool(m,{send=((m,mbuf,name))})
     match srr with
+    | {noconnection} -> false
     | {reconnect} -> recon()
     | {~sendresult} -> sendresult
     | _ -> @fail
@@ -382,6 +389,7 @@ MongoDriver = {{
       else ML.fatal("MongoDriver.sndrcv({name}):","comms error (Can't reconnect)",-1)
     srr = srpool(m,{sendrecv=((m,mbuf,name))})
     match srr with
+    | {noconnection} -> none
     | {reconnect} -> recon()
     | {~sndrcvresult} -> sndrcvresult
     | _ -> @fail
@@ -397,6 +405,7 @@ MongoDriver = {{
       else ML.fatal("MongoDriver.snderr({name}):","comms error (Can't reconnect)",-1)
     srr = srpool(m,{senderror=((m,mbuf,name,ns))})
     match srr with
+    | {noconnection} -> none
     | {reconnect} -> recon()
     | {~snderrresult} -> snderrresult
     | _ -> @fail

diff --git a/stdlib/apis/mongo/replset.opa b/stdlib/apis/mongo/replset.opa
@@ -15,6 +15,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with OPA.  If not, see <http://www.gnu.org/licenses/>.
 */
+package stdlib.apis.mongo
 
 /**
  * MongoDB binding for OPA.
@@ -204,6 +205,8 @@ MongoReplicaSet = {{
    * In practice, this should never happen.
    **/
   connect(m:Mongo.db): outcome(Mongo.db,Mongo.failure) =
+    //m = {m with log=true}
+    do if m.log then ML.debug("MongoReplicaSet.connect","depth={m.depth}",void)
     do if m.seeds == [] then ML.fatal("MongoReplicaSet.connect","Tried to connect with no seeds",-1) else void
     rec aux(m, seeds) =
       match seeds with

diff --git a/stdlib/apis/mongo/selectupdate.opa b/stdlib/apis/mongo/selectupdate.opa
@@ -15,6 +15,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with OPA.  If not, see <http://www.gnu.org/licenses/>.
 */
+package stdlib.apis.mongo
 
 /**
  * MongoDB binding for OPA.

diff --git a/stdlib/apis/mongo/socketpool.opa b/stdlib/apis/mongo/socketpool.opa
@@ -15,6 +15,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with OPA.  If not, see <http://www.gnu.org/licenses/>.
 */
+package stdlib.apis.mongo
 
 import stdlib.queue
 

diff --git a/stdlib/apis/mongo/types.opa b/stdlib/apis/mongo/types.opa
@@ -15,6 +15,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with OPA.  If not, see <http://www.gnu.org/licenses/>.
 */
+package stdlib.apis.mongo
 
 /**
  * MongoDB binding for OPA.

diff --git a/stdlib/apis/mongo/view.opa b/stdlib/apis/mongo/view.opa
@@ -15,6 +15,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with OPA.  If not, see <http://www.gnu.org/licenses/>.
 */
+package stdlib.apis.mongo
 
 /**
  * MongoDB binding for OPA.