Evolinx/evorepo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reporead: simplify and fix transaction management in update_common()

Browse Source 
We can use the easier transaction.commit_on_success() decorator if we be
sure to explicitly mark the transaction dirty. This fixes the issue
where a raised exception in this code called neither commit nor
rollback.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2012-01-19 10:53:49 -06:00
parent b2b5c1a064
commit 1a6554dab7
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
devel/management/commands/reporead.py
View File

@ -118,7 +118,8 @@ def populate(self, values):
self.builddate = datetime.strptime(v[0],
'%a %b %d %H:%M:%S %Y')
except ValueError:
logger.warning('Package %s had unparsable build date %s',
logger.warning(
'Package %s had unparsable build date %s',
self.name, v[0])
elif k == 'files':
self.files = tuple(v)
@ -290,7 +291,13 @@ def select_pkg_for_update(dbpkg):
def update_common(archname, reponame, pkgs, sanity_check=True):
with transaction.commit_manually():
# If isolation level is repeatable-read, we need to ensure each package
# update starts a new transaction and re-queries the database as
# necessary to guard against simultaneous updates.
with transaction.commit_on_success():
# force the transaction dirty, even though we will only do reads
transaction.set_dirty()
repository = Repo.objects.get(name__iexact=reponame)
architecture = Arch.objects.get(name__iexact=archname)
# no-arg order_by() removes even the default ordering; we don't need it
@ -300,17 +307,16 @@ def update_common(archname, reponame, pkgs, sanity_check=True):
logger.info("%d packages in current web DB", len(dbpkgs))
logger.info("%d packages in new updating DB", len(pkgs))
# Try to catch those random package deletions that make Eric so unhappy.
if len(dbpkgs):
dbpercent = 100.0 * len(pkgs) / len(dbpkgs)
else:
dbpercent = 0.0
logger.info("DB package ratio: %.1f%%", dbpercent)
# Fewer than 20 packages makes the percentage check unreliable, but it also
# means we expect the repo to fluctuate a lot.
msg = "Package database has %.1f%% the number of packages in the " \
"web database" % dbpercent
# Fewer than 20 packages makes the percentage check unreliable, but it
# also means we expect the repo to fluctuate a lot.
msg = "Package database %s (%s) has %.1f%% the number of packages " \
"the web database"
if not sanity_check:
pass
elif repository.testing or repository.staging:
@ -318,15 +324,10 @@ def update_common(archname, reponame, pkgs, sanity_check=True):
elif len(dbpkgs) == 0 and len(pkgs) == 0:
pass
elif len(dbpkgs) > 20 and dbpercent < 50.0:
logger.error(msg)
raise Exception(msg)
logger.error(msg, reponame, archname, dbpercent)
raise Exception(msg % (reponame, archname, dbpercent))
elif dbpercent < 75.0:
logger.warning(msg)
# If isolation level is repeatable-read, we need to ensure each package
# update starts a new transaction and re-queries the database as necessary
# to guard against simultaneous updates
transaction.commit()
logger.warning(msg, reponame, archname, dbpercent)
return dbpkgs