Switch mirror status delay display to average delay
This takes a bit more work to compute, but since we cache all of this anyway it isn't too big of deal. Using average delay instead of last delay will be a bit more fair on mirrors that have odd syncing schedules, as well as exposing those that only sync once a day. Also fix an issue that will arise with cutoff_time being calculated once, and adjust mirror score to treat hours delay as a float rather than an integer. Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
550ef2eeeb
commit
0dba93a9fc
@ -5,10 +5,10 @@
|
||||
|
||||
import datetime
|
||||
|
||||
cutoff_time = datetime.datetime.utcnow() - datetime.timedelta(hours=24)
|
||||
|
||||
@cache_function(300)
|
||||
def get_mirror_statuses():
|
||||
cutoff_time = datetime.datetime.utcnow() - datetime.timedelta(hours=24)
|
||||
protocols = MirrorProtocol.objects.exclude(protocol__iexact='rsync')
|
||||
# I swear, this actually has decent performance...
|
||||
urls = MirrorUrl.objects.select_related(
|
||||
@ -18,15 +18,27 @@ def get_mirror_statuses():
|
||||
logs__check_time__gte=cutoff_time).annotate(
|
||||
check_count=Count('logs'), last_sync=Max('logs__last_sync'),
|
||||
last_check=Max('logs__check_time'),
|
||||
duration_avg=Avg('logs__duration'), duration_min=Min('logs__duration'),
|
||||
duration_max=Max('logs__duration'), duration_stddev=StdDev('logs__duration')
|
||||
duration_avg=Avg('logs__duration'),
|
||||
duration_stddev=StdDev('logs__duration')
|
||||
).order_by('-last_sync', '-duration_avg')
|
||||
|
||||
# The Django ORM makes it really hard to get actual average delay in the
|
||||
# above query, so run a seperate query for it and we will process the
|
||||
# results here.
|
||||
times = MirrorLog.objects.filter(is_success=True, last_sync__isnull=False,
|
||||
check_time__gte=cutoff_time)
|
||||
delays = {}
|
||||
for log in times:
|
||||
d = log.check_time - log.last_sync
|
||||
delays.setdefault(log.url_id, []).append(d)
|
||||
|
||||
for url in urls:
|
||||
if url.last_check and url.last_sync:
|
||||
d = url.last_check - url.last_sync
|
||||
if url.id in delays:
|
||||
url_delays = delays[url.id]
|
||||
d = sum(url_delays, datetime.timedelta()) / len(url_delays)
|
||||
url.delay = d
|
||||
url.score = d.days * 24 + d.seconds / 3600 + url.duration_avg + url.duration_stddev
|
||||
hours = d.days * 24.0 + d.seconds / 3600.0
|
||||
url.score = hours + url.duration_avg + url.duration_stddev
|
||||
else:
|
||||
url.delay = None
|
||||
url.score = None
|
||||
@ -34,6 +46,7 @@ def get_mirror_statuses():
|
||||
|
||||
@cache_function(300)
|
||||
def get_mirror_errors():
|
||||
cutoff_time = datetime.datetime.utcnow() - datetime.timedelta(hours=24)
|
||||
errors = MirrorLog.objects.filter(
|
||||
is_success=False, check_time__gte=cutoff_time).values(
|
||||
'url__url', 'url__protocol__protocol', 'url__mirror__country',
|
||||
|
@ -20,8 +20,9 @@ <h2>Mirror Status</h2>
|
||||
<tt>lastsync</tt> file on the mirror. If this file could not be
|
||||
retrieved or contained data we didn't recognize, this column will show
|
||||
'unknown'.</li>
|
||||
<li><em>Delay:</em> The calculated mirroring delay; e.g. <code>last
|
||||
check − last sync</code>.</li>
|
||||
<li><em>μ Delay:</em> The calculated average mirroring delay; e.g. the
|
||||
mean value of <code>last check − last sync</code> for each check of
|
||||
this mirror URL.</li>
|
||||
<li><em>μ Duration:</em> The average (mean) time it took to connect and
|
||||
retrieve the <tt>lastsync</tt> file from the given URL. Note that this
|
||||
connection time is from the location of the Arch server; your geography
|
||||
@ -92,8 +93,10 @@ <h3>Mirror Syncing Error Log</h3>
|
||||
<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
$("#outofsync_mirrors").add("#successful_mirrors").tablesorter(
|
||||
$("#outofsync_mirrors").tablesorter(
|
||||
{widgets: ['zebra'], sortList: [[3,1], [5,1]]});
|
||||
$("#successful_mirrors").tablesorter(
|
||||
{widgets: ['zebra'], sortList: [[7,0]]});
|
||||
$("#errorlog_mirrors").tablesorter(
|
||||
{widgets: ['zebra'], sortList: [[4,1], [5,1]]});
|
||||
});
|
||||
|
@ -6,7 +6,7 @@
|
||||
<th>Protocol</th>
|
||||
<th>Country</th>
|
||||
<th>Last Sync</th>
|
||||
<th>Delay (hh:mm)</th>
|
||||
<th>μ Delay (hh:mm)</th>
|
||||
<th>μ Duration (secs)</th>
|
||||
<th>σ Duration (secs)</th>
|
||||
<th>Mirror Score</th>
|
||||
@ -22,7 +22,7 @@
|
||||
<td>{{ m_url.delay|duration|default:'unknown' }}</td>
|
||||
<td>{{ m_url.duration_avg|floatformat:2|default:'unknown' }}</td>
|
||||
<td>{{ m_url.duration_stddev|floatformat:2|default:'unknown' }}</td>
|
||||
<td>{{ m_url.score|floatformat:1|default:'unknown' }}</td>
|
||||
<td>{{ m_url.score|floatformat:1|default:'∞' }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
|
Loading…
Reference in New Issue
Block a user