chg: Cache the ASN meta info during a ranking

pull/12/head
Raphaël Vinot 2019-04-09 11:56:12 +02:00
parent 96dccb1cb4
commit 7b22cb7b8d
1 changed files with 8 additions and 2 deletions

View File

@ -27,6 +27,7 @@ class Ranking():
asns_aggregation_key_v6 = f'{day}|asns|v6' asns_aggregation_key_v6 = f'{day}|asns|v6'
to_delete = set([asns_aggregation_key_v4, asns_aggregation_key_v6]) to_delete = set([asns_aggregation_key_v4, asns_aggregation_key_v6])
r_pipeline = self.ranking.pipeline() r_pipeline = self.ranking.pipeline()
cached_meta = {}
for source in self.storage.smembers(f'{day}|sources'): for source in self.storage.smembers(f'{day}|sources'):
self.logger.info(f'{day} - Ranking source: {source}') self.logger.info(f'{day} - Ranking source: {source}')
source_aggregation_key_v4 = f'{day}|{source}|asns|v4' source_aggregation_key_v4 = f'{day}|{source}|asns|v4'
@ -58,8 +59,13 @@ class Ranking():
else: else:
asn_rank_v6 += len(ips) * config_files[source]['impact'] asn_rank_v6 += len(ips) * config_files[source]['impact']
r_pipeline.zincrby(prefixes_aggregation_key_v6, prefix_rank * config_files[source]['impact'], prefix) r_pipeline.zincrby(prefixes_aggregation_key_v6, prefix_rank * config_files[source]['impact'], prefix)
v4info = self.ipasn.asn_meta(asn=asn, source='caida', address_family='v4', date=day) if asn in cached_meta:
v6info = self.ipasn.asn_meta(asn=asn, source='caida', address_family='v6', date=day) v4info = cached_meta[asn]['v4']
v6info = cached_meta[asn]['v6']
else:
v4info = self.ipasn.asn_meta(asn=asn, source='caida', address_family='v4', date=day)
v6info = self.ipasn.asn_meta(asn=asn, source='caida', address_family='v6', date=day)
cached_meta[asn] = {'v4': v4info, 'v6': v6info}
ipasnhistory_date_v4 = list(v4info['response'].keys())[0] ipasnhistory_date_v4 = list(v4info['response'].keys())[0]
v4count = v4info['response'][ipasnhistory_date_v4][asn]['ipcount'] v4count = v4info['response'][ipasnhistory_date_v4][asn]['ipcount']
ipasnhistory_date_v6 = list(v6info['response'].keys())[0] ipasnhistory_date_v6 = list(v6info['response'].keys())[0]