openstack/swift
Code Issues Proposed changes

Merge "Commit from pending file less often" into feature/deep

Browse Source
This commit is contained in:
Zuul 2018-04-27 02:08:28 +00:00 committed by Gerrit Code Review
commit b8af4019a3
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swift/container/backend.py
View File

@ -789,7 +789,6 @@ class ContainerBroker(DatabaseBroker):
return self._is_deleted_info(**info) return self._is_deleted_info(**info)
def is_reclaimable(self, now, reclaim_age): def is_reclaimable(self, now, reclaim_age):
self._commit_puts_stale_ok()
with self.get() as conn: with self.get() as conn:
info = conn.execute(''' info = conn.execute('''
SELECT put_timestamp, delete_timestamp SELECT put_timestamp, delete_timestamp
@ -1617,7 +1616,6 @@ class ContainerBroker(DatabaseBroker):
raise raise
return [] return []
self._commit_puts_stale_ok()
if connection: if connection:
return do_query(connection) return do_query(connection)
else: else: