X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fclean_suites.py;h=7419b83b5496e9b3ecca15e19d71326b8e449be0;hb=6cc75beccd14c9b39621cb5894d67cec24750405;hp=46e19d53c84996d63fcc5bd8042207a034d000ec;hpb=387dc72c94e4a77150549230ac1dc479289d79c0;p=dak.git diff --git a/dak/clean_suites.py b/dak/clean_suites.py index 46e19d53..7419b83b 100755 --- a/dak/clean_suites.py +++ b/dak/clean_suites.py @@ -1,7 +1,13 @@ #!/usr/bin/env python -""" Cleans up unassociated binary and source packages """ -# Copyright (C) 2000, 2001, 2002, 2003, 2006 James Troup +""" Cleans up unassociated binary and source packages + +@contact: Debian FTPMaster +@copyright: 2000, 2001, 2002, 2003, 2006 James Troup +@copyright: 2009 Mark Hymers +@copyright: 2010 Joerg Jaspert +@license: GNU General Public License version 2 or later +""" # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,7 +34,10 @@ ################################################################################ -import os, stat, sys, time +import os +import stat +import sys +import time import apt_pkg from datetime import datetime, timedelta @@ -62,10 +71,15 @@ def check_binaries(now_date, delete_date, max_delete, session): # deletion. q = session.execute(""" -SELECT b.file, f.filename FROM binaries b, files f - WHERE f.last_used IS NULL AND b.file = f.id - AND NOT EXISTS (SELECT 1 FROM bin_associations ba WHERE ba.bin = b.id)""") - +SELECT b.file, f.filename + FROM binaries b + LEFT JOIN files f + ON (b.file = f.id) + WHERE f.last_used IS NULL + AND b.id NOT IN + (SELECT ba.bin FROM bin_associations ba) + AND f.id NOT IN + (SELECT bqf.fileid FROM build_queue_files bqf)""") for i in q.fetchall(): Logger.log(["set lastused", i[1]]) if not Options["No-Action"]: @@ -79,9 +93,15 @@ SELECT b.file, f.filename FROM binaries b, files f # but are now used again. q = session.execute(""" -SELECT b.file, f.filename FROM binaries b, files f - WHERE f.last_used IS NOT NULL AND f.id = b.file - AND EXISTS (SELECT 1 FROM bin_associations ba WHERE ba.bin = b.id)""") +SELECT b.file, f.filename + FROM binaries b + LEFT JOIN files f + ON (b.file = f.id) + WHERE f.last_used IS NOT NULL + AND (b.id IN + (SELECT ba.bin FROM bin_associations ba) + OR f.id IN + (SELECT bqf.fileid FROM build_queue_files bqf))""") for i in q.fetchall(): Logger.log(["unset lastused", i[1]]) @@ -99,10 +119,18 @@ def check_sources(now_date, delete_date, max_delete, session): # Get the list of source packages not in a suite and not used by # any binaries. q = session.execute(""" -SELECT s.id, s.file, f.filename FROM source s, files f - WHERE f.last_used IS NULL AND s.file = f.id - AND NOT EXISTS (SELECT 1 FROM src_associations sa WHERE sa.source = s.id) - AND NOT EXISTS (SELECT 1 FROM binaries b WHERE b.source = s.id)""") +SELECT s.id, s.file, f.filename + FROM source s + LEFT JOIN files f + ON (s.file = f.id) + WHERE f.last_used IS NULL + AND s.id NOT IN + (SELECT sa.source FROM src_associations sa) + AND s.id NOT IN + (SELECT b.source FROM binaries b) + AND s.id NOT IN (SELECT esr.src_id FROM extra_src_references esr) + AND f.id NOT IN + (SELECT bqf.fileid FROM build_queue_files bqf)""") #### XXX: this should ignore cases where the files for the binary b #### have been marked for deletion (so the delay between bins go @@ -140,12 +168,13 @@ SELECT s.id, s.file, f.filename FROM source s, files f # Check for any sources which are marked for deletion but which # are now used again. - q = session.execute(""" SELECT f.id, f.filename FROM source s, files f, dsc_files df WHERE f.last_used IS NOT NULL AND s.id = df.source AND df.file = f.id AND ((EXISTS (SELECT 1 FROM src_associations sa WHERE sa.source = s.id)) - OR (EXISTS (SELECT 1 FROM binaries b WHERE b.source = s.id)))""") + OR (EXISTS (SELECT 1 FROM extra_src_references esr WHERE esr.src_id = s.id)) + OR (EXISTS (SELECT 1 FROM binaries b WHERE b.source = s.id)) + OR (EXISTS (SELECT 1 FROM build_queue_files bqf WHERE bqf.fileid = s.file)))""") #### XXX: this should also handle deleted binaries specially (ie, not #### reinstate sources because of them @@ -175,7 +204,7 @@ SELECT id, filename FROM files f WHERE NOT EXISTS (SELECT 1 FROM binaries b WHERE b.file = f.id) AND NOT EXISTS (SELECT 1 FROM dsc_files df WHERE df.file = f.id) AND NOT EXISTS (SELECT 1 FROM changes_pool_files cpf WHERE cpf.fileid = f.id) - AND NOT EXISTS (SELECT 1 FROM queue_files qf WHERE qf.id = f.id) + AND NOT EXISTS (SELECT 1 FROM build_queue_files qf WHERE qf.fileid = f.id) AND last_used IS NULL ORDER BY filename""") @@ -217,17 +246,26 @@ def clean(now_date, delete_date, max_delete, session): print "Cleaning out packages..." - cur_date = now_date.strftime("%Y-%m-%d") - dest = os.path.join(cnf["Dir::Morgue"], cnf["Clean-Suites::MorgueSubDir"], cur_date) - if not os.path.exists(dest): - os.mkdir(dest) + morguedir = cnf.get("Dir::Morgue", os.path.join("Dir::Pool", 'morgue')) + morguesubdir = cnf.get("Clean-Suites::MorgueSubDir", 'pool') + + # Build directory as morguedir/morguesubdir/year/month/day + dest = os.path.join(morguedir, + morguesubdir, + str(now_date.year), + '%.2d' % now_date.month, + '%.2d' % now_date.day) + + if not Options["No-Action"] and not os.path.exists(dest): + os.makedirs(dest) # Delete from source print "Deleting from source table... " q = session.execute(""" SELECT s.id, f.filename FROM source s, files f WHERE f.last_used <= :deletedate - AND s.file = f.id""", {'deletedate': delete_date}) + AND s.file = f.id + AND s.id NOT IN (SELECT src_id FROM extra_src_references)""", {'deletedate': delete_date}) for s in q.fetchall(): Logger.log(["delete source", s[1], s[0]]) if not Options["No-Action"]: @@ -270,13 +308,11 @@ SELECT s.id, f.filename FROM source s, files f if not Options["No-Action"]: session.delete(pf) + session.commit() else: utils.fubar("%s is neither symlink nor file?!" % (filename)) - if not Options["No-Action"]: - session.commit() - if count > 0: Logger.log(["total", count, utils.size_type(size)]) print "Cleaned %d files, %s." % (count, utils.size_type(size)) @@ -339,46 +375,13 @@ SELECT f.id, f.fingerprint FROM fingerprint f ################################################################################ -def clean_queue_build(now_date, delete_date, max_delete, session): - - cnf = Config() - - if not cnf.ValueList("Dinstall::QueueBuildSuites") or Options["No-Action"]: - return - - print "Cleaning out queue build symlinks..." - - our_delete_date = now_date - timedelta(seconds = int(cnf["Clean-Suites::QueueBuildStayOfExecution"])) - count = 0 - - for qf in session.query(BuildQueueFile).filter(BuildQueueFile.last_used <= our_delete_date): - if not os.path.exists(qf.filename): - utils.warn("%s (from queue_build) doesn't exist." % (qf.filename)) - continue - - if not cnf.FindB("Dinstall::SecurityQueueBuild") and not os.path.islink(qf.filename): - utils.fubar("%s (from queue_build) should be a symlink but isn't." % (qf.filename)) - - Logger.log(["delete queue build", qf.filename]) - if not Options["No-Action"]: - os.unlink(qf.filename) - session.delete(qf) - count += 1 - - if not Options["No-Action"]: - session.commit() - - if count: - Logger.log(["total", count]) - print "Cleaned %d queue_build files." % (count) - -################################################################################ - def clean_empty_directories(session): """ Removes empty directories from pool directories. """ + print "Cleaning out empty directories..." + count = 0 cursor = session.execute( @@ -423,7 +426,7 @@ def main(): max_delete = int(cnf["Clean-Suites::Options::Maximum"]) if max_delete < 1: utils.fubar("If given, Maximum must be at least 1") - except ValueError, e: + except ValueError as e: utils.fubar("If given, Maximum must be an integer") else: max_delete = None @@ -431,12 +434,16 @@ def main(): if Options["Help"]: usage() - Logger = daklog.Logger(cnf, "clean-suites", debug=Options["No-Action"]) + Logger = daklog.Logger("clean-suites", debug=Options["No-Action"]) session = DBConn().session() now_date = datetime.now() - delete_date = now_date - timedelta(seconds=int(cnf['Clean-Suites::StayOfExecution'])) + + # Stay of execution; default to 1.5 days + soe = int(cnf.get('Clean-Suites::StayOfExecution', '129600')) + + delete_date = now_date - timedelta(seconds=soe) check_binaries(now_date, delete_date, max_delete, session) clean_binaries(now_date, delete_date, max_delete, session) @@ -445,7 +452,6 @@ def main(): clean(now_date, delete_date, max_delete, session) clean_maintainers(now_date, delete_date, max_delete, session) clean_fingerprints(now_date, delete_date, max_delete, session) - clean_queue_build(now_date, delete_date, max_delete, session) clean_empty_directories(session) Logger.close()