X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=cmd%2Ffsck-cmd.py;h=293024e8d81948492a857eef4d96903f1277ca66;hb=28d78a7487d860397e1f2fe579a5096af41eb58f;hp=1c2505812d8c7a75981ff246519798d3439228ff;hpb=2ff672c48f3dbde761b30775adcdc76a621df527;p=bup.git diff --git a/cmd/fsck-cmd.py b/cmd/fsck-cmd.py index 1c25058..293024e 100755 --- a/cmd/fsck-cmd.py +++ b/cmd/fsck-cmd.py @@ -1,13 +1,28 @@ -#!/usr/bin/env python +#!/bin/sh +"""": # -*-python-*- +bup_python="$(dirname "$0")/bup-python" || exit $? +exec "$bup_python" "$0" ${1+"$@"} +""" +# end of bup preamble + +from __future__ import absolute_import, print_function import sys, os, glob, subprocess +from shutil import rmtree +from subprocess import PIPE, Popen +from tempfile import mkdtemp +from binascii import hexlify + from bup import options, git -from bup.helpers import * +from bup.compat import argv_bytes +from bup.helpers import Sha1, chunkyreader, istty2, log, progress +from bup.io import byte_stream + par2_ok = 0 -nullf = open('/dev/null') +nullf = open(os.devnull, 'wb+') def debug(s): - if opt.verbose: + if opt.verbose > 1: log(s) def run(argv): @@ -26,7 +41,7 @@ def par2_setup(): global par2_ok rv = 1 try: - p = subprocess.Popen(['par2', '--help'], + p = subprocess.Popen([b'par2', b'--help'], stdout=nullf, stderr=nullf, stdin=nullf) rv = p.wait() except OSError: @@ -34,27 +49,59 @@ def par2_setup(): else: par2_ok = 1 -def parv(lvl): - if opt.verbose >= lvl: - if istty: - return [] - else: - return ['-q'] +def is_par2_parallel(): + # A true result means it definitely allows -t1; a false result is + # technically inconclusive, but likely means no. + tmpdir = mkdtemp(prefix=b'bup-fsck') + try: + canary = tmpdir + b'/canary' + with open(canary, 'wb') as f: + f.write(b'canary\n') + p = subprocess.Popen((b'par2', b'create', b'-qq', b'-t1', canary), + stderr=PIPE, stdin=nullf) + _, err = p.communicate() + parallel = p.returncode == 0 + if opt.verbose: + if len(err) > 0 and err != b'Invalid option specified: -t1\n': + log('Unexpected par2 error output\n') + log(repr(err) + '\n') + if parallel: + log('Assuming par2 supports parallel processing\n') + else: + log('Assuming par2 does not support parallel processing\n') + return parallel + finally: + rmtree(tmpdir) + +_par2_parallel = None + +def par2(action, args, verb_floor=0): + global _par2_parallel + if _par2_parallel is None: + _par2_parallel = is_par2_parallel() + cmd = [b'par2', action] + if opt.verbose >= verb_floor and not istty2: + cmd.append(b'-q') else: - return ['-qq'] + cmd.append(b'-qq') + if _par2_parallel: + cmd.append(b'-t1') + cmd.extend(args) + return run(cmd) def par2_generate(base): - return run(['par2', 'create', '-n1', '-c200'] + parv(2) - + ['--', base, base+'.pack', base+'.idx']) + return par2(b'create', + [b'-n1', b'-c200', b'--', base, base + b'.pack', base + b'.idx'], + verb_floor=2) def par2_verify(base): - return run(['par2', 'verify'] + parv(3) + ['--', base]) + return par2(b'verify', [b'--', base], verb_floor=3) def par2_repair(base): - return run(['par2', 'repair'] + parv(2) + ['--', base]) + return par2(b'repair', [b'--', base], verb_floor=2) def quick_verify(base): - f = open(base + '.pack', 'rb') + f = open(base + b'.pack', 'rb') f.seek(-20, 2) wantsum = f.read(20) assert(len(wantsum) == 20) @@ -63,7 +110,7 @@ def quick_verify(base): for b in chunkyreader(f, os.fstat(f.fileno()).st_size - 20): sum.update(b) if sum.digest() != wantsum: - raise ValueError('expected %r, got %r' % (wantsum.encode('hex'), + raise ValueError('expected %r, got %r' % (hexlify(wantsum), sum.hexdigest())) @@ -71,15 +118,15 @@ def git_verify(base): if opt.quick: try: quick_verify(base) - except Exception, e: - debug('error: %s\n' % e) + except Exception as e: + log('error: %s\n' % e) return 1 return 0 else: - return run(['git', 'verify-pack', '--', base]) + return run([b'git', b'verify-pack', b'--', base]) -def do_pack(base, last): +def do_pack(base, last, par2_exists, out): code = 0 if par2_ok and par2_exists and (opt.repair or not opt.generate): vresult = par2_verify(base) @@ -87,34 +134,41 @@ def do_pack(base, last): if opt.repair: rresult = par2_repair(base) if rresult != 0: - print '%s par2 repair: failed (%d)' % (last, rresult) + action_result = b'failed' + log('%s par2 repair: failed (%d)\n' % (last, rresult)) code = rresult else: - print '%s par2 repair: succeeded (0)' % last + action_result = b'repaired' + log('%s par2 repair: succeeded (0)\n' % last) code = 100 else: - print '%s par2 verify: failed (%d)' % (last, vresult) + action_result = b'failed' + log('%s par2 verify: failed (%d)\n' % (last, vresult)) code = vresult else: - print '%s ok' % last + action_result = b'ok' elif not opt.generate or (par2_ok and not par2_exists): gresult = git_verify(base) if gresult != 0: - print '%s git verify: failed (%d)' % (last, gresult) + action_result = b'failed' + log('%s git verify: failed (%d)\n' % (last, gresult)) code = gresult else: if par2_ok and opt.generate: presult = par2_generate(base) if presult != 0: - print '%s par2 create: failed (%d)' % (last, presult) + action_result = b'failed' + log('%s par2 create: failed (%d)\n' % (last, presult)) code = presult else: - print '%s ok' % last + action_result = b'generated' else: - print '%s ok' % last + action_result = b'ok' else: assert(opt.generate and (not par2_ok or par2_exists)) - debug(' skipped: par2 file already generated.\n') + action_result = b'exists' if par2_exists else b'skipped' + if opt.verbose: + out.write(last + b' ' + action_result + b'\n') return code @@ -129,8 +183,9 @@ j,jobs= run 'n' jobs in parallel par2-ok immediately return 0 if par2 is ok, 1 if not disable-par2 ignore par2 even if it is available """ -o = options.Options('bup fsck', optspec) +o = options.Options(optspec) (opt, flags, extra) = o.parse(sys.argv[1:]) +opt.verbose = opt.verbose or 0 par2_setup() if opt.par2_ok: @@ -143,36 +198,40 @@ if opt.disable_par2: git.check_repo_or_die() -if not extra: +if extra: + extra = [argv_byes(x) for x in extra] +else: debug('fsck: No filenames given: checking all packs.\n') - extra = glob.glob(git.repo('objects/pack/*.pack')) + extra = glob.glob(git.repo(b'objects/pack/*.pack')) +sys.stdout.flush() +out = byte_stream(sys.stdout) code = 0 count = 0 outstanding = {} for name in extra: - if name.endswith('.pack'): + if name.endswith(b'.pack'): base = name[:-5] - elif name.endswith('.idx'): + elif name.endswith(b'.idx'): base = name[:-4] - elif name.endswith('.par2'): + elif name.endswith(b'.par2'): base = name[:-5] - elif os.path.exists(name + '.pack'): + elif os.path.exists(name + b'.pack'): base = name else: - raise Exception('%s is not a pack file!' % name) + raise Exception('%r is not a pack file!' % name) (dir,last) = os.path.split(base) - par2_exists = os.path.exists(base + '.par2') - if par2_exists and os.stat(base + '.par2').st_size == 0: + par2_exists = os.path.exists(base + b'.par2') + if par2_exists and os.stat(base + b'.par2').st_size == 0: par2_exists = 0 - sys.stdout.flush() - debug('fsck: checking %s (%s)\n' + sys.stdout.flush() # Not sure we still need this, but it'll flush out too + debug('fsck: checking %r (%s)\n' % (last, par2_ok and par2_exists and 'par2' or 'git')) if not opt.verbose: progress('fsck (%d/%d)\r' % (count, len(extra))) if not opt.jobs: - nc = do_pack(base, last) + nc = do_pack(base, last, par2_exists, out) code = code or nc count += 1 else: @@ -188,8 +247,8 @@ for name in extra: outstanding[pid] = 1 else: # child try: - sys.exit(do_pack(base, last)) - except Exception, e: + sys.exit(do_pack(base, last, par2_exists, out)) + except Exception as e: log('exception: %r\n' % e) sys.exit(99) @@ -203,6 +262,6 @@ while len(outstanding): if not opt.verbose: progress('fsck (%d/%d)\r' % (count, len(extra))) -if not opt.verbose and istty: - log('fsck done. \n') +if istty2: + debug('fsck done. \n') sys.exit(code)