From f79a27b745530799a75d21a66945e9dc8178e772 Mon Sep 17 00:00:00 2001 From: Eric Price Date: Thu, 24 Jan 2008 17:20:30 -0500 Subject: [PATCH] Do entire ACL update in a transaction, not for each machine. svn path=/trunk/web/; revision=257 --- cache_acls.py | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/cache_acls.py b/cache_acls.py index 353574a..e0094e8 100644 --- a/cache_acls.py +++ b/cache_acls.py @@ -33,17 +33,28 @@ def expandName(name): if __name__ == '__main__': connect('postgres://sipb-xen@sipb-xen-dev/sipb_xen') - machines = Machine.select() - for m in machines: - people = set() - people.update(expandLocker(m.owner)) - people.update(expandName(m.administrator)) - print '%s: %s' % (m.name, ' '.join(people)) - transaction = ctx.current.create_transaction() - for a in m.acl: - ctx.current.delete(a) - for p in people: - ma = MachineAccess(machine_id=m.machine_id, user=p) - ctx.current.save(ma) - ctx.current.flush() + transaction = ctx.current.create_transaction() + + print repr(ctx), repr(ctx.current), repr(transaction) + # Remove existing machine access entries + machine_access_table.delete() + ctx.current.flush() + + try: + machines = Machine.select() + for m in machines: + people = set() + people.update(expandLocker(m.owner)) + people.update(expandName(m.administrator)) + print '%s: %s' % (m.name, ' '.join(people)) + for p in people: + ma = MachineAccess(machine_id=m.machine_id, user=p) + ctx.current.save(ma) + ctx.current.flush() + + # Atomically execute our changes transaction.commit() + except: + # Failed! Rollback all the changes. + transaction.rollback() + raise -- 1.7.9.5