diff options
| author | Rob Austein <sra@hactrn.net> | 2014-03-31 23:55:12 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2014-03-31 23:55:12 +0000 |
| commit | dead9d9f427898dad328232422f92b570e27459b (patch) | |
| tree | 50624d72bc660a879cb8abcbc15ffdc7c85efeb5 /rpkid | |
| parent | 0dd2a614d5f468aae0b553d951044bf17226e328 (diff) | |
Debug deferred_upgrade code.
svn path=/branches/tk671/; revision=5723
Diffstat (limited to 'rpkid')
| -rwxr-xr-x | rpkid/rpki-sql-setup | 8 | ||||
| -rw-r--r-- | rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/rpkid/rpki-sql-setup b/rpkid/rpki-sql-setup index 1d25d5c5..1863622a 100755 --- a/rpkid/rpki-sql-setup +++ b/rpkid/rpki-sql-setup @@ -21,7 +21,6 @@ import os import sys import glob -import time import getpass import argparse import datetime @@ -180,12 +179,12 @@ class UserDB(object): try: while True: self.cur.execute("SELECT id, script FROM deferred_upgrade ORDER BY id LIMIT 1") - row = cur.fetchone() + row = self.cur.fetchone() if row is None: break rowid, script = row yield script - self.cur.execute("DELETE FROM upgrade_version WHERE id = %s", (rowid,)) + self.cur.execute("DELETE FROM deferred_upgrade WHERE id = %s", (rowid,)) self.db.commit() except _mysql_exceptions.ProgrammingError, e: if e.args[0] != ER_NO_SUCH_TABLE: @@ -300,9 +299,6 @@ def do_apply_deferred_upgrades(name): db = UserDB(name) db.open() for i, script in enumerate(db.deferred_upgrades): - if i == 0: - log("Pausing to let RPKI daemons start up") - time.sleep(10) log("Running deferred upgrade #%i for %s" % (i, name)) exec script db.close() diff --git a/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py b/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py index b46ce5d7..b89ff500 100644 --- a/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py +++ b/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py @@ -36,6 +36,9 @@ print """ import subprocess, time +print "Pausing to let RPKI daemons start up" +time.sleep(10) + handles = subprocess.check_output(("rpkic", "list_self_handles")).splitlines() for handle in handles: |