X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fupdate_db.py;h=88d8e4e66e6425e91a6501c5c09af21a8e395b5a;hb=d7b90c4606e6f4fe32965d3c77d8f5f7428b7168;hp=6db74d9de35195df4d66ce782ba1495cb9d0442c;hpb=3dacb5ce101166f2902d435bec60585584c47842;p=dak.git diff --git a/dak/update_db.py b/dak/update_db.py index 6db74d9d..3effa477 100755 --- a/dak/update_db.py +++ b/dak/update_db.py @@ -1,7 +1,11 @@ #!/usr/bin/env python -# Debian Archive Kit Database Update Script +""" Database Update Main Script + +@contact: Debian FTP Master # Copyright (C) 2008 Michael Casadevall +@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 @@ -26,17 +30,23 @@ ################################################################################ -import psycopg2, sys, fcntl, os +import psycopg2 +import sys +import fcntl +import os import apt_pkg import time -from daklib import database +import errno + from daklib import utils +from daklib.config import Config +from daklib.dak_exceptions import DBUpdateError +from daklib.daklog import Logger ################################################################################ Cnf = None -projectB = None -required_database_schema = 3 +required_database_schema = 48 ################################################################################ @@ -52,7 +62,7 @@ Updates dak's database schema to the lastest version. You should disable crontab ################################################################################ def update_db_to_zero(self): - # This function will attempt to update a pre-zero database schema to zero + """ This function will attempt to update a pre-zero database schema to zero """ # First, do the sure thing, and create the configuration table try: @@ -63,7 +73,7 @@ Updates dak's database schema to the lastest version. You should disable crontab name TEXT UNIQUE NOT NULL, value TEXT );""") - c.execute("INSERT INTO config VALUES ( nextval('config_id_seq'), 'db_revision', '0')"); + c.execute("INSERT INTO config VALUES ( nextval('config_id_seq'), 'db_revision', '0')") self.db.commit() except psycopg2.ProgrammingError: @@ -77,14 +87,12 @@ Updates dak's database schema to the lastest version. You should disable crontab ################################################################################ def get_db_rev(self): - global projectB - # We keep database revision info the config table # Try and access it try: c = self.db.cursor() - q = c.execute("SELECT value FROM config WHERE name = 'db_revision';"); + q = c.execute("SELECT value FROM config WHERE name = 'db_revision';") return c.fetchone()[0] except psycopg2.ProgrammingError: @@ -93,17 +101,34 @@ Updates dak's database schema to the lastest version. You should disable crontab print "No configuration table found, assuming dak database revision to be pre-zero" return -1 +################################################################################ + + def get_transaction_id(self): + ''' + Returns the current transaction id as a string. + ''' + cursor = self.db.cursor() + cursor.execute("SELECT txid_current();") + id = cursor.fetchone()[0] + cursor.close() + return id + ################################################################################ def update_db(self): # Ok, try and find the configuration table print "Determining dak database revision ..." + cnf = Config() + logger = Logger(cnf.Cnf, 'update-db') try: # Build a connect string - connect_str = "dbname=%s"% (Cnf["DB::Name"]) - if Cnf["DB::Host"] != '': connect_str += " host=%s" % (Cnf["DB::Host"]) - if Cnf["DB::Port"] != '-1': connect_str += " port=%d" % (int(Cnf["DB::Port"])) + if cnf["DB::Service"]: + connect_str = "service=%s" % cnf["DB::Service"] + else: + connect_str = "dbname=%s"% (cnf["DB::Name"]) + if cnf["DB::Host"] != '': connect_str += " host=%s" % (cnf["DB::Host"]) + if cnf["DB::Port"] != '-1': connect_str += " port=%d" % (int(cnf["DB::Port"])) self.db = psycopg2.connect(connect_str) @@ -112,6 +137,7 @@ Updates dak's database schema to the lastest version. You should disable crontab pass database_revision = int(self.get_db_rev()) + logger.log(['transaction id before update: %s' % self.get_transaction_id()]) if database_revision == -1: print "dak database schema predates update-db." @@ -127,50 +153,59 @@ Updates dak's database schema to the lastest version. You should disable crontab self.update_db_to_zero() database_revision = 0 - print "dak database schema at " + str(database_revision) - print "dak version requires schema " + str(required_database_schema) + print "dak database schema at %d" % database_revision + print "dak version requires schema %d" % required_database_schema if database_revision == required_database_schema: print "no updates required" + logger.log(["no updates required"]) sys.exit(0) for i in range (database_revision, required_database_schema): - print "updating databse schema from " + str(database_revision) + " to " + str(i+1) - dakdb = __import__("dakdb", globals(), locals(), ['update'+str(i+1)]) - update_module = getattr(dakdb, "update"+str(i+1)) - update_module.do_update(self) + try: + dakdb = __import__("dakdb", globals(), locals(), ['update'+str(i+1)]) + update_module = getattr(dakdb, "update"+str(i+1)) + update_module.do_update(self) + message = "updated database schema from %d to %d" % (database_revision, i+1) + print message + logger.log([message]) + except DBUpdateError, e: + # Seems the update did not work. + print "Was unable to update database schema from %d to %d." % (database_revision, i+1) + print "The error message received was %s" % (e) + logger.log(["DB Schema upgrade failed"]) + logger.close() + utils.fubar("DB Schema upgrade failed") database_revision += 1 + logger.close() ################################################################################ def init (self): - global Cnf, projectB - - Cnf = utils.get_conf() + cnf = Config() arguments = [('h', "help", "Update-DB::Options::Help")] for i in [ "help" ]: - if not Cnf.has_key("Update-DB::Options::%s" % (i)): - Cnf["Update-DB::Options::%s" % (i)] = "" + if not cnf.has_key("Update-DB::Options::%s" % (i)): + cnf["Update-DB::Options::%s" % (i)] = "" - arguments = apt_pkg.ParseCommandLine(Cnf, arguments, sys.argv) + arguments = apt_pkg.ParseCommandLine(cnf.Cnf, arguments, sys.argv) - options = Cnf.SubTree("Update-DB::Options") + options = cnf.SubTree("Update-DB::Options") if options["Help"]: self.usage() elif arguments: utils.warn("dak update-db takes no arguments.") self.usage(exit_code=1) - - self.update_db() - try: - lock_fd = os.open(Cnf["Dinstall::LockFile"], os.O_RDWR | os.O_CREAT) + lock_fd = os.open(cnf["Dinstall::LockFile"], os.O_RDWR | os.O_CREAT) fcntl.lockf(lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB) except IOError, e: if errno.errorcode[e.errno] == 'EACCES' or errno.errorcode[e.errno] == 'EAGAIN': utils.fubar("Couldn't obtain lock; assuming another 'dak process-unchecked' is already running.") + self.update_db() + ################################################################################