X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fclean_suites.py;h=7419b83b5496e9b3ecca15e19d71326b8e449be0;hb=6cc75beccd14c9b39621cb5894d67cec24750405;hp=d40f67ecbccf54cf04a9e9e0626a9ac903bd03cc;hpb=84e2afd2b02875e9d28f83426ac8c1dbaf90b120;p=dak.git diff --git a/dak/clean_suites.py b/dak/clean_suites.py index d40f67ec..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,17 +34,22 @@ ################################################################################ -import os, stat, sys, time +import os +import stat +import sys +import time import apt_pkg from datetime import datetime, timedelta from daklib.config import Config from daklib.dbconn import * from daklib import utils +from daklib import daklog ################################################################################ Options = None +Logger = None ################################################################################ @@ -59,29 +70,46 @@ def check_binaries(now_date, delete_date, max_delete, session): # Get the list of binary packages not in a suite and mark them for # deletion. - # TODO: This can be a single SQL UPDATE statement q = session.execute(""" -SELECT b.file 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(): - session.execute("UPDATE files SET last_used = :lastused WHERE id = :fileid AND last_used IS NULL", - {'lastused': now_date, 'fileid': i[0]}) - session.commit() + Logger.log(["set lastused", i[1]]) + if not Options["No-Action"]: + session.execute("UPDATE files SET last_used = :lastused WHERE id = :fileid AND last_used IS NULL", + {'lastused': now_date, 'fileid': i[0]}) + + if not Options["No-Action"]: + session.commit() # Check for any binaries which are marked for eventual deletion # but are now used again. - # TODO: This can be a single SQL UPDATE statement q = session.execute(""" -SELECT b.file 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(): - session.execute("UPDATE files SET last_used = NULL WHERE id = :fileid", {'fileid': i[0]}) - session.commit() + Logger.log(["unset lastused", i[1]]) + if not Options["No-Action"]: + session.execute("UPDATE files SET last_used = NULL WHERE id = :fileid", {'fileid': i[0]}) + + if not Options["No-Action"]: + session.commit() ######################################## @@ -91,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 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 @@ -103,45 +139,54 @@ SELECT s.id, s.file FROM source s, files f for i in q.fetchall(): source_id = i[0] dsc_file_id = i[1] + dsc_fname = i[2] # Mark the .dsc file for deletion - session.execute("""UPDATE files SET last_used = :last_used - WHERE id = :dscfileid AND last_used IS NULL""", - {'last_used': now_date, 'dscfileid': dsc_file_id}) + Logger.log(["set lastused", dsc_fname]) + if not Options["No-Action"]: + session.execute("""UPDATE files SET last_used = :last_used + WHERE id = :dscfileid AND last_used IS NULL""", + {'last_used': now_date, 'dscfileid': dsc_file_id}) # Mark all other files references by .dsc too if they're not used by anyone else - x = session.execute("""SELECT f.id FROM files f, dsc_files d + x = session.execute("""SELECT f.id, f.filename FROM files f, dsc_files d WHERE d.source = :sourceid AND d.file = f.id""", {'sourceid': source_id}) for j in x.fetchall(): file_id = j[0] + file_name = j[1] y = session.execute("SELECT id FROM dsc_files d WHERE d.file = :fileid", {'fileid': file_id}) if len(y.fetchall()) == 1: - session.execute("""UPDATE files SET last_used = :lastused - WHERE id = :fileid AND last_used IS NULL""", - {'lastused': now_date, 'fileid': file_id}) + Logger.log(["set lastused", file_name]) + if not Options["No-Action"]: + session.execute("""UPDATE files SET last_used = :lastused + WHERE id = :fileid AND last_used IS NULL""", + {'lastused': now_date, 'fileid': file_id}) - session.commit() + if not Options["No-Action"]: + session.commit() # Check for any sources which are marked for deletion but which # are now used again. - q = session.execute(""" -SELECT f.id FROM source s, files f, dsc_files df +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 - # Could be done in SQL; but left this way for hysterical raisins - # [and freedom to innovate don'cha know?] for i in q.fetchall(): - session.execute("UPDATE files SET last_used = NULL WHERE id = :fileid", - {'fileid': i[0]}) + Logger.log(["unset lastused", i[1]]) + if not Options["No-Action"]: + session.execute("UPDATE files SET last_used = NULL WHERE id = :fileid", + {'fileid': i[0]}) - session.commit() + if not Options["No-Action"]: + session.commit() ######################################## @@ -158,17 +203,23 @@ def check_files(now_date, delete_date, max_delete, session): 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 build_queue_files qf WHERE qf.fileid = f.id) + AND last_used IS NULL ORDER BY filename""") ql = q.fetchall() if len(ql) > 0: - print "WARNING: check_files found something it shouldn't" + utils.warn("check_files found something it shouldn't") for x in ql: - print x - session.execute("UPDATE files SET last_used = :lastused WHERE id = :fileid", - {'lastused': now_date, 'fileid': x[0]}) + utils.warn("orphaned file: %s" % x) + Logger.log(["set lastused", x[1], "ORPHANED FILE"]) + if not Options["No-Action"]: + session.execute("UPDATE files SET last_used = :lastused WHERE id = :fileid", + {'lastused': now_date, 'fileid': x[0]}) - session.commit() + if not Options["No-Action"]: + session.commit() def clean_binaries(now_date, delete_date, max_delete, session): # We do this here so that the binaries we remove will have their @@ -177,12 +228,13 @@ def clean_binaries(now_date, delete_date, max_delete, session): # XXX: why doesn't this remove the files here as well? I don't think it # buys anything keeping this separate print "Cleaning binaries from the DB..." + print "Deleting from binaries table... " + for bin in session.query(DBBinary).join(DBBinary.poolfile).filter(PoolFile.last_used <= delete_date): + Logger.log(["delete binary", bin.poolfile.filename]) + if not Options["No-Action"]: + session.delete(bin) if not Options["No-Action"]: - print "Deleting from binaries table... " - session.execute("""DELETE FROM binaries WHERE EXISTS - (SELECT 1 FROM files WHERE binaries.file = files.id - AND files.last_used <= :deldate)""", - {'deldate': delete_date}) + session.commit() ######################################## @@ -194,47 +246,52 @@ 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 - if not Options["No-Action"]: - print "Deleting from source table... " - session.execute("""DELETE FROM dsc_files - WHERE EXISTS - (SELECT 1 FROM source s, files f, dsc_files df - WHERE f.last_used <= :deletedate - AND s.file = f.id AND s.id = df.source - AND df.id = dsc_files.id)""", {'deletedate': delete_date}) - session.execute("""DELETE FROM source - WHERE EXISTS - (SELECT 1 FROM files - WHERE source.file = files.id - AND files.last_used <= :deletedate)""", {'deletedate': delete_date}) + 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 + 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"]: + session.execute("DELETE FROM dsc_files WHERE source = :s_id", {"s_id":s[0]}) + session.execute("DELETE FROM source WHERE id = :s_id", {"s_id":s[0]}) + if not Options["No-Action"]: session.commit() # Delete files from the pool - query = """SELECT l.path, f.filename FROM location l, files f - WHERE f.last_used <= :deletedate AND l.id = f.location""" + old_files = session.query(PoolFile).filter(PoolFile.last_used <= delete_date) if max_delete is not None: - query += " LIMIT %d" % max_delete + old_files = old_files.limit(max_delete) print "Limiting removals to %d" % max_delete - q = session.execute(query, {'deletedate': delete_date}) - for i in q.fetchall(): - filename = i[0] + i[1] + for pf in old_files: + filename = os.path.join(pf.location.path, pf.filename) if not os.path.exists(filename): utils.warn("can not find '%s'." % (filename)) continue + Logger.log(["delete pool file", filename]) if os.path.isfile(filename): if os.path.islink(filename): count += 1 - if Options["No-Action"]: - print "Removing symlink %s..." % (filename) - else: + Logger.log(["delete symlink", filename]) + if not Options["No-Action"]: os.unlink(filename) else: size += os.stat(filename)[stat.ST_SIZE] @@ -245,23 +302,19 @@ def clean(now_date, delete_date, max_delete, session): if os.path.exists(dest_filename): dest_filename = utils.find_next_free(dest_filename) - if Options["No-Action"]: - print "Cleaning %s -> %s ..." % (filename, dest_filename) - else: + Logger.log(["move to morgue", filename, dest_filename]) + if not Options["No-Action"]: utils.move(filename, dest_filename) + + if not Options["No-Action"]: + session.delete(pf) + session.commit() + else: utils.fubar("%s is neither symlink nor file?!" % (filename)) - # Delete from the 'files' table - # XXX: I've a horrible feeling that the max_delete stuff breaks here - mhy - # TODO: Change it so we do the DELETEs as we go; it'll be slower but - # more reliable - if not Options["No-Action"]: - print "Deleting from files table... " - session.execute("DELETE FROM files WHERE last_used <= :deletedate", {'deletedate': delete_date}) - session.commit() - if count > 0: + Logger.log(["total", count, utils.size_type(size)]) print "Cleaned %d files, %s." % (count, utils.size_type(size)) ################################################################################ @@ -271,7 +324,7 @@ def clean_maintainers(now_date, delete_date, max_delete, session): # TODO Replace this whole thing with one SQL statement q = session.execute(""" -SELECT m.id FROM maintainer m +SELECT m.id, m.name FROM maintainer m WHERE NOT EXISTS (SELECT 1 FROM binaries b WHERE b.maintainer = m.id) AND NOT EXISTS (SELECT 1 FROM source s WHERE s.maintainer = m.id OR s.changedby = m.id) AND NOT EXISTS (SELECT 1 FROM src_uploaders u WHERE u.maintainer = m.id)""") @@ -280,14 +333,16 @@ SELECT m.id FROM maintainer m for i in q.fetchall(): maintainer_id = i[0] + Logger.log(["delete maintainer", i[1]]) if not Options["No-Action"]: session.execute("DELETE FROM maintainer WHERE id = :maint", {'maint': maintainer_id}) - count += 1 + count += 1 if not Options["No-Action"]: session.commit() if count > 0: + Logger.log(["total", count]) print "Cleared out %d maintainer entries." % (count) ################################################################################ @@ -297,7 +352,7 @@ def clean_fingerprints(now_date, delete_date, max_delete, session): # TODO Replace this whole thing with one SQL statement q = session.execute(""" -SELECT f.id FROM fingerprint f +SELECT f.id, f.fingerprint FROM fingerprint f WHERE f.keyring IS NULL AND NOT EXISTS (SELECT 1 FROM binaries b WHERE b.sig_fpr = f.id) AND NOT EXISTS (SELECT 1 FROM source s WHERE s.sig_fpr = f.id)""") @@ -306,56 +361,51 @@ SELECT f.id FROM fingerprint f for i in q.fetchall(): fingerprint_id = i[0] + Logger.log(["delete fingerprint", i[1]]) if not Options["No-Action"]: session.execute("DELETE FROM fingerprint WHERE id = :fpr", {'fpr': fingerprint_id}) - count += 1 + count += 1 if not Options["No-Action"]: session.commit() if count > 0: + Logger.log(["total", count]) print "Cleared out %d fingerprint entries." % (count) ################################################################################ -def clean_queue_build(now_date, delete_date, max_delete, session): - - cnf = Config() - - if not cnf.ValueList("Dinstall::QueueBuildSuites") or Options["No-Action"]: - return +def clean_empty_directories(session): + """ + Removes empty directories from pool directories. + """ - print "Cleaning out queue build symlinks..." + print "Cleaning out empty directories..." - our_delete_date = now_date - timedelta(seconds = int(cnf["Clean-Suites::QueueBuildStayOfExecution"])) count = 0 - q = session.execute("SELECT filename FROM queue_build WHERE last_used <= :deletedate", - {'deletedate': our_delete_date}) - for i in q.fetchall(): - filename = i[0] - if not os.path.exists(filename): - utils.warn("%s (from queue_build) doesn't exist." % (filename)) - continue - - if not cnf.FindB("Dinstall::SecurityQueueBuild") and not os.path.islink(filename): - utils.fubar("%s (from queue_build) should be a symlink but isn't." % (filename)) - - os.unlink(filename) - count += 1 - - session.execute("DELETE FROM queue_build WHERE last_used <= :deletedate", - {'deletedate': our_delete_date}) - - session.commit() + cursor = session.execute( + "SELECT DISTINCT(path) FROM location WHERE type = :type", + {'type': 'pool'}, + ) + bases = [x[0] for x in cursor.fetchall()] + + for base in bases: + for dirpath, dirnames, filenames in os.walk(base, topdown=False): + if not filenames and not dirnames: + to_remove = os.path.join(base, dirpath) + if not Options["No-Action"]: + Logger.log(["removing directory", to_remove]) + os.removedirs(to_remove) + count += 1 if count: - print "Cleaned %d queue_build files." % (count) + Logger.log(["total removed directories", count]) ################################################################################ def main(): - global Options + global Options, Logger cnf = Config() @@ -376,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 @@ -384,10 +434,16 @@ def main(): if Options["Help"]: usage() + 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) @@ -396,7 +452,9 @@ 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() ################################################################################