flifloo/BackupPC_archive_host_B2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

unlink_worker: don't verify the remote file

Browse source 
send_file does this now, and odds are good that if it verified
once, it's going to verify a second time...
This commit is contained in:
Ryan Tucker 2011-09-24 18:18:18 -04:00
parent e8f7ce4cf9
commit e74e89ede1
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
BackupPC_archiveHost_s3
View file

@ -188,22 +188,8 @@ def unlink_worker(in_q, accesskey, sharedkey, host):
bucket = open_s3(accesskey, sharedkey, host) bucket = open_s3(accesskey, sharedkey, host)
for filename in iter(in_q.get, 'STOP'): for filename in iter(in_q.get, 'STOP'):
counter += 1 counter += 1
retry_count = 0
max_retries = 3
done = False
while retry_count <= max_retries and not done:
if verify_file(bucket, filename):
logger.debug("unlink_worker: deleting %s", filename) logger.debug("unlink_worker: deleting %s", filename)
os.unlink(filename) os.unlink(filename)
done = True
else:
retry_count += 1
sleeptime = 2**retry_count
logger.error("unlink_worker: verify_file on %s returned false, retrying in %i seconds (%i/%i)", filename, sleeptime, retry_count, max_retries)
time.sleep(sleeptime)
if not done:
logger.error("unlink_worker: could not verify remote %s in %i retries", filename, retry_count)
logger.debug("unlink_worker: queue is empty, terminating after %i items in %i seconds", counter, time.time() - start_time) logger.debug("unlink_worker: queue is empty, terminating after %i items in %i seconds", counter, time.time() - start_time)
time.sleep(5) # settle time.sleep(5) # settle