archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Orphan finder: store the orphan-files.txt file in STORAGE_DIR

Browse Source 
This allows running the orphan finder inside a docker container.
This commit is contained in:
Sybren A. Stüvel
2017-09-14 17:34:02 +02:00
parent ddc8fc0f5e
commit d4facbf2e3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pillar/cli/maintenance.py
View File

@@ -608,7 +608,7 @@ def find_orphan_files():
from jinja2.filters import do_filesizeformat from jinja2.filters import do_filesizeformat
from pathlib import Path from pathlib import Path
output_fpath = Path('orphan-files.txt') output_fpath = Path(current_app.config['STORAGE_DIR']) / 'orphan-files.txt'
if output_fpath.exists(): if output_fpath.exists():
log.error('Output filename %s already exists, remove it first.', output_fpath) log.error('Output filename %s already exists, remove it first.', output_fpath)
return 1 return 1
@@ -640,7 +640,7 @@ def find_orphan_files():
duration = end_timestamp - start_timestamp duration = end_timestamp - start_timestamp
log.info('Finding orphans took %s', duration) log.info('Finding orphans took %s', duration)
log.info('Writing Object IDs to orphan-files.txt') log.info('Writing Object IDs to %s', output_fpath)
with output_fpath.open('w', encoding='ascii') as outfile: with output_fpath.open('w', encoding='ascii') as outfile:
outfile.write('\n'.join(str(oid) for oid in sorted(orphans)) + '\n') outfile.write('\n'.join(str(oid) for oid in sorted(orphans)) + '\n')
@@ -652,8 +652,10 @@ def delete_orphan_files():
Use 'find_orphan_files' first to generate orphan-files.txt. Use 'find_orphan_files' first to generate orphan-files.txt.
""" """
import pymongo.results import pymongo.results
from pathlib import Path
with open('orphan-files.txt', 'r', encoding='ascii') as infile: output_fpath = Path(current_app.config['STORAGE_DIR']) / 'orphan-files.txt'
with output_fpath.open('r', encoding='ascii') as infile:
oids = [bson.ObjectId(oid.strip()) for oid in infile] oids = [bson.ObjectId(oid.strip()) for oid in infile]
log.info('Found %d Object IDs to remove', len(oids)) log.info('Found %d Object IDs to remove', len(oids))