Merge lp:~cmiller/desktopcouch/sleep-and-retry-on-socket-error into lp:desktopcouch

[Chad Miller]

Try to avoid a bug I can not reproduce, which may be related to suspend in some way. On a socket error when trying to talk to couchdb, reconnect, which may spawn a new couchdb if one is not running (for reasons that are unknown to Chad). (LP: #522538)

[Tim Cole (tcole)]

Some sort of backoff on retry would be good, particularly if we're not only connecting to localhost with this code (in which case e.g. there may be actual network issues).

review: Approve

[Guillermo Gonzalez (verterok)]

+1 on Tim's idea about a backoff

review: Approve

[Guillermo Gonzalez (verterok)]

btw, could you add some test for this case?
As I don't know much about desktopcouch code, I don't know if it's even possible...but I think it would be good to have a test for this.

review: Needs Information

[Rodrigo Moya (rodrigo-moya)]

Yeah, it should have some kind of max number of reconnect attempts

review: Needs Fixing

[Chad Miller (cmiller)]

Rodrigo, it does have a maximum. This is the error condition in the body of a 'for' loop.

[Rodrigo Moya (rodrigo-moya)]

> Rodrigo, it does have a maximum. This is the error condition in the body of a
> 'for' loop.

ah, sorry, missed that, so approving

review: Approve

=== modified file 'desktopcouch/records/server_base.py'
--- desktopcouch/records/server_base.py	2010-04-19 16:07:11 +0000
+++ desktopcouch/records/server_base.py	2010-04-27 17:32:29 +0000
@@ -23,6 +23,7 @@
 
 import httplib2, urlparse, cgi, copy
 from time import time
+import socket
 
 # please keep desktopcouch python 2.5 compatible for now
 
@@ -167,10 +168,16 @@
                     logging.warn("DB connection timed out.  Reconnecting.")
                     self._reconnect()
                     continue
+                elif isinstance(e, socket.error):
+                    logging.warn("Other socket error %s.  Reconnecting.", e)
+                    time.sleep(0.3)  
+                    self._reconnect()
+                    continue
                 else:
                     raise
 
     def _reconnect(self):
+        logging.info("Connecting to %s." % (self.server_uri or "discovered local port",))
         self._server = self._server_class(self.server_uri,
                 **self._server_class_extras)
         if self._database_name not in self._server: