calcglobalstats/deletestats: Improve duration logging and output
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
parent
80f20f4d0c
commit
48bf9c008b
|
@ -268,22 +268,29 @@ def delete_orphaned_routers(mysql):
|
||||||
def delete_old_stats(mysql):
|
def delete_old_stats(mysql):
|
||||||
threshold=(utcnow() - datetime.timedelta(days=CONFIG["router_stat_days"])).timestamp()
|
threshold=(utcnow() - datetime.timedelta(days=CONFIG["router_stat_days"])).timestamp()
|
||||||
|
|
||||||
|
start_time = time.time()
|
||||||
mysql.execute("""
|
mysql.execute("""
|
||||||
DELETE s FROM router_stats AS s
|
DELETE s FROM router_stats AS s
|
||||||
LEFT JOIN router AS r ON s.router = r.id
|
LEFT JOIN router AS r ON s.router = r.id
|
||||||
WHERE s.time < %s AND (r.status = 'online' OR r.status IS NULL)
|
WHERE s.time < %s AND (r.status = 'online' OR r.status IS NULL)
|
||||||
""",(threshold,))
|
""",(threshold,))
|
||||||
mysql.commit()
|
mysql.commit()
|
||||||
|
writelog(CONFIG["debug_dir"] + "/deletetime.txt", "Delete stats: %.3f seconds" % (time.time() - start_time))
|
||||||
|
print("--- Delete stats: %.3f seconds ---" % (time.time() - start_time))
|
||||||
|
|
||||||
time.sleep(10)
|
time.sleep(10)
|
||||||
|
start_time = time.time()
|
||||||
mysql.execute("""
|
mysql.execute("""
|
||||||
DELETE s FROM router_stats_neighbor AS s
|
DELETE s FROM router_stats_neighbor AS s
|
||||||
LEFT JOIN router AS r ON s.router = r.id
|
LEFT JOIN router AS r ON s.router = r.id
|
||||||
WHERE s.time < %s AND (r.status = 'online' OR r.status IS NULL)
|
WHERE s.time < %s AND (r.status = 'online' OR r.status IS NULL)
|
||||||
""",(threshold,))
|
""",(threshold,))
|
||||||
mysql.commit()
|
mysql.commit()
|
||||||
|
writelog(CONFIG["debug_dir"] + "/deletetime.txt", "Delete neighbor-stats: %.3f seconds" % (time.time() - start_time))
|
||||||
|
print("--- Delete neighbor-stats: %.3f seconds ---" % (time.time() - start_time))
|
||||||
|
|
||||||
time.sleep(10)
|
time.sleep(10)
|
||||||
|
start_time = time.time()
|
||||||
mysql.execute("""
|
mysql.execute("""
|
||||||
UPDATE router_stats_netif AS s
|
UPDATE router_stats_netif AS s
|
||||||
LEFT JOIN router AS r ON s.router = r.id
|
LEFT JOIN router AS r ON s.router = r.id
|
||||||
|
@ -291,8 +298,13 @@ def delete_old_stats(mysql):
|
||||||
WHERE s.time < %s AND (r.status = 'online' OR r.status IS NULL)
|
WHERE s.time < %s AND (r.status = 'online' OR r.status IS NULL)
|
||||||
""",(threshold,))
|
""",(threshold,))
|
||||||
mysql.commit()
|
mysql.commit()
|
||||||
|
writelog(CONFIG["debug_dir"] + "/deletetime.txt", "Update netif stats: %.3f seconds" % (time.time() - start_time))
|
||||||
|
print("--- Update netif stats: %.3f seconds ---" % (time.time() - start_time))
|
||||||
|
|
||||||
time.sleep(30)
|
time.sleep(30)
|
||||||
|
minustime=0
|
||||||
rowsaffected=1
|
rowsaffected=1
|
||||||
|
start_time = time.time()
|
||||||
while rowsaffected > 0:
|
while rowsaffected > 0:
|
||||||
try:
|
try:
|
||||||
rowsaffected = mysql.execute("""
|
rowsaffected = mysql.execute("""
|
||||||
|
@ -304,7 +316,11 @@ def delete_old_stats(mysql):
|
||||||
except my.OperationalError:
|
except my.OperationalError:
|
||||||
rowsaffected = 1
|
rowsaffected = 1
|
||||||
time.sleep(10)
|
time.sleep(10)
|
||||||
|
minustime += 10
|
||||||
|
writelog(CONFIG["debug_dir"] + "/deletetime.txt", "Delete netif stats: %.3f seconds" % (time.time() - start_time - minustime))
|
||||||
|
print("--- Delete netif stats: %.3f seconds ---" % (time.time() - start_time - minustime))
|
||||||
|
|
||||||
|
start_time = time.time()
|
||||||
events = mysql.fetchall("""
|
events = mysql.fetchall("""
|
||||||
SELECT router, COUNT(time) AS count FROM router_events
|
SELECT router, COUNT(time) AS count FROM router_events
|
||||||
GROUP BY router
|
GROUP BY router
|
||||||
|
@ -319,8 +335,9 @@ def delete_old_stats(mysql):
|
||||||
ORDER BY time ASC
|
ORDER BY time ASC
|
||||||
LIMIT %s
|
LIMIT %s
|
||||||
""",(e["router"],delnum,))
|
""",(e["router"],delnum,))
|
||||||
|
|
||||||
mysql.commit()
|
mysql.commit()
|
||||||
|
writelog(CONFIG["debug_dir"] + "/deletetime.txt", "Delete events: %.3f seconds" % (time.time() - start_time))
|
||||||
|
print("--- Delete events: %.3f seconds ---" % (time.time() - start_time))
|
||||||
|
|
||||||
def events_append(mysql,router_id,event,comment):
|
def events_append(mysql,router_id,event,comment):
|
||||||
mysql.execute("""
|
mysql.execute("""
|
||||||
|
|
|
@ -24,4 +24,4 @@ record_hood_stats(mysql)
|
||||||
update_mapnik_csv(mysql)
|
update_mapnik_csv(mysql)
|
||||||
mysql.close()
|
mysql.close()
|
||||||
|
|
||||||
print("--- %s seconds ---" % (time.time() - start_time))
|
print("--- %.3f seconds ---" % (time.time() - start_time))
|
||||||
|
|
|
@ -16,4 +16,4 @@ mysql = FreifunkMySQL()
|
||||||
delete_old_stats(mysql)
|
delete_old_stats(mysql)
|
||||||
mysql.close()
|
mysql.close()
|
||||||
|
|
||||||
print("--- %s seconds ---" % (time.time() - start_time))
|
print("--- Total duration: %.3f seconds ---" % (time.time() - start_time))
|
||||||
|
|
Loading…
Reference in New Issue