x/stacktach
Code Issues Proposed changes

Using Exist's audit_period_ending in verifier instead of RawData's when

Browse Source
This commit is contained in:
Andrew Melton 2013-04-08 17:06:57 -04:00
parent 265512bcd6
commit 32bef7714e
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/unit/test_verifier_db.py
View File

@ -427,7 +427,7 @@ class VerifierTestCase(unittest.TestCase):
models.InstanceExists.PENDING = 'pending'
models.InstanceExists.VERIFYING = 'verifying'
filters = {
'raw__when__lte': dt.dt_to_decimal(when_max),
'audit_period_ending__lte': dt.dt_to_decimal(when_max),
'status': 'pending'
}
results.filter(**filters).AndReturn(results)
@ -456,7 +456,7 @@ class VerifierTestCase(unittest.TestCase):
models.InstanceExists.PENDING = 'pending'
models.InstanceExists.VERIFYING = 'verifying'
filters = {
'raw__when__lte': dt.dt_to_decimal(when_max),
'audit_period_ending__lte': dt.dt_to_decimal(when_max),
'status': 'pending'
}
results.filter(**filters).AndReturn(results)

20
verifier/dbverifier.py
View File

@ -54,12 +54,10 @@ handler.setFormatter(formatter)
LOG.addHandler(handler)
def _list_exists(received_max=None, received_min=None, status=None):
def _list_exists(ending_max=None, status=None):
params = {}
if received_max:
params['raw__when__lte'] = dt.dt_to_decimal(received_max)
if received_min:
params['raw__when__gt'] = dt.dt_to_decimal(received_min)
if ending_max:
params['audit_period_ending__lte'] = dt.dt_to_decimal(ending_max)
if status:
params['status'] = status
return models.InstanceExists.objects.select_related()\
@ -226,8 +224,8 @@ def _verify(exist):
results = []
def verify_for_range(pool, when_max, callback=None):
exists = _list_exists(received_max=when_max,
def verify_for_range(pool, ending_max, callback=None):
exists = _list_exists(ending_max=ending_max,
status=models.InstanceExists.PENDING)
count = exists.count()
added = 0
@ -315,8 +313,8 @@ def _run(config, pool, callback=None):
with transaction.commit_on_success():
now = datetime.datetime.utcnow()
kwargs = {settle_units: settle_time}
when_max = now - datetime.timedelta(**kwargs)
new = verify_for_range(pool, when_max, callback=callback)
ending_max = now - datetime.timedelta(**kwargs)
new = verify_for_range(pool, ending_max, callback=callback)
msg = "N: %s, P: %s, S: %s, E: %s" % ((new,) + clean_results())
LOG.info(msg)
@ -352,8 +350,8 @@ def _run_once(config, pool, callback=None):
settle_time = config['settle_time']
now = datetime.datetime.utcnow()
kwargs = {settle_units: settle_time}
when_max = now - datetime.timedelta(**kwargs)
new = verify_for_range(pool, when_max, callback=callback)
ending_max = now - datetime.timedelta(**kwargs)
new = verify_for_range(pool, ending_max, callback=callback)
LOG.info("Verifying %s exist events" % new)
while len(results) > 0: