Merge remote-tracking branch 'refs/remotes/drebs/bug/5448_add-workaround-for-hanging-requests-after-multipart-put' into develop

1 files changed, 10 insertions, 0 deletions

diff --git a/common/src/leap/soledad/common/couch.py b/common/src/leap/soledad/common/couch.py
index ebe8477f..1bb84985 100644
--- a/common/src/leap/soledad/common/couch.py
+++ b/common/src/leap/soledad/common/couch.py
@@ -855,6 +855,7 @@ class CouchDatabase(CommonBackend):
         try:
             self._database.resource.put_json(
                 doc.doc_id, body=buf.getvalue(), headers=envelope.headers)
+            self._renew_couch_session()
         except ResourceConflict:
             raise RevisionConflict()
 
@@ -1415,6 +1416,15 @@ class CouchDatabase(CommonBackend):
                 continue
             yield t._doc
 
+    def _renew_couch_session(self):
+        """
+        Create a new couch connection session.
+
+        This is a workaround for #5448. Will not be needed once bigcouch is
+        merged with couchdb.
+        """
+        self._database.resource.session = Session(timeout=COUCH_TIMEOUT)
+
 
 class CouchSyncTarget(CommonSyncTarget):
     """