Merge lp:~wgrant/launchpad/bug-1408557-mitigate into lp:launchpad

[William Grant]

Mitigate librarian swift FD leaks (bug #1408557) by reusing connections on 404.

Mitigate librarian swift FD leaks (bug #1408557) by reusing connections on 404.

This isn't a complete fix, but it's worked on production for a couple of days.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/services/librarianserver/storage.py'
--- lib/lp/services/librarianserver/storage.py	2014-10-17 09:21:23 +0000
+++ lib/lp/services/librarianserver/storage.py	2015-01-09 23:17:01 +0000
@@ -99,7 +99,9 @@
             swift_stream = TxSwiftStream(swift_connection, chunks)
             defer.returnValue(swift_stream)
         except swiftclient.ClientException as x:
-            if x.http_status != 404:
+            if x.http_status == 404:
+                swift.connection_pool.put(swift_connection)
+            else:
                 self.swift_download_fails += 1
                 log.err(x)
         except Exception as x: