flo/nsupdate.info
1
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Releases Activity

"faults" management command: use atomic transaction PER HOST

Browse Source 
This was an atomic transaction per ALL hosts (IIRC introduced in the hope of better speed).
But a frequently occurring problem was that it processed SOME hosts, then ran into a
database locked error and then it rolled back all the changes and aborted processing for all hosts.

This led to the strange behaviour that users got emails about abuse flag being set, but it wasn't set.
And also other stuff behaved wrong, like fault counters.

Now, the atomic transaction is per host, so a host is either processed completely and correctly or rolled back.
If an exception happens, the roll back occurs, the traceback is logged and we just continue with next host.
This commit is contained in:
Thomas Waldmann 2015-06-04 12:06:21 +02:00
parent 21c1a9dab7
commit 0f2e0235cb
1 changed files with 51 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
nsupdate/management/commands/faults.py
View File

@ -2,6 +2,8 @@
dealing with the fault counters and available/abuse/abuse_blocked flags
"""
import traceback
from optparse import make_option
from django.core.management.base import BaseCommand
@ -118,45 +120,53 @@ class Command(BaseCommand):
reset_abuse_blocked = options['reset_abuse_blocked']
flag_abuse = options['flag_abuse']
notify_user = options['notify_user']
with transaction.atomic():
for h in Host.objects.all():
if show_client or show_server:
output = u""
if show_client:
output += u"%-6d " % h.client_faults
if show_server:
output += u"%-6d " % h.server_faults
output += u"%s %s\n" % (h.created_by.username, h.get_fqdn(), )
self.stdout.write(output)
if (flag_abuse is not None or reset_client or reset_server or
reset_available or reset_abuse or reset_abuse_blocked):
if flag_abuse is not None:
if h.client_faults > flag_abuse:
h.abuse = True
faults_count = h.client_faults
for h in Host.objects.all():
try:
with transaction.atomic():
if show_client or show_server:
output = u""
if show_client:
output += u"%-6d " % h.client_faults
if show_server:
output += u"%-6d " % h.server_faults
output += u"%s %s\n" % (h.created_by.username, h.get_fqdn(), )
self.stdout.write(output)
if (flag_abuse is not None or reset_client or reset_server or
reset_available or reset_abuse or reset_abuse_blocked):
if flag_abuse is not None:
if h.client_faults > flag_abuse:
h.abuse = True
faults_count = h.client_faults
h.client_faults = 0
fqdn = h.get_fqdn()
comment = h.comment
creator = h.created_by
self.stdout.write("setting abuse flag for host %s (created by %s, client faults: %d)\n" % (
fqdn, creator, faults_count))
if notify_user:
subject, msg = translate_for_user(
creator,
_("issue with your host %(fqdn)s"),
ABUSE_MSG
)
subject = subject % dict(fqdn=fqdn)
msg = msg % dict(fqdn=fqdn, comment=comment, faults_count=faults_count)
send_mail_to_user(creator, subject, msg)
if reset_client:
h.client_faults = 0
fqdn = h.get_fqdn()
comment = h.comment
creator = h.created_by
self.stdout.write("setting abuse flag for host %s (created by %s, client faults: %d)\n" % (
fqdn, creator, faults_count))
if notify_user:
subject, msg = translate_for_user(
creator,
_("issue with your host %(fqdn)s"),
ABUSE_MSG
)
subject = subject % dict(fqdn=fqdn)
msg = msg % dict(fqdn=fqdn, comment=comment, faults_count=faults_count)
send_mail_to_user(creator, subject, msg)
if reset_client:
h.client_faults = 0
if reset_server:
h.server_faults = 0
if reset_available:
h.available = True
if reset_abuse:
h.abuse = False
if reset_abuse_blocked:
h.abuse_blocked = False
h.save()
if reset_server:
h.server_faults = 0
if reset_available:
h.available = True
if reset_abuse:
h.abuse = False
if reset_abuse_blocked:
h.abuse_blocked = False
h.save()
except Exception:
try:
msg = u"The following Exception occurred when processing host %s!\n" % (h.get_fqdn(), )
self.stderr.write(msg)
except Exception:
pass
traceback.print_exc()