Pathogen
/
monolith
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify variable names and reformat

This commit is contained in:
Mark Veidemanis 2022-08-11 20:51:41 +01:00
parent 5a4ae2153e
commit 4c040bbf78
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/chankeep.py
View File

@ -69,16 +69,27 @@ def emptyChanAllocate(net, flist, relay, new):
chanfree[0][i] = chanfree[1] chanfree[0][i] = chanfree[1]
allocated = {} allocated = {}
toalloc = len(flist) toalloc = len(flist)
# Used to correct allocations and provision additional relays
# if the math since the last LIST is a bit wrong
# toalloc:2148 free:{1: 250} chanlimit:250 correction:2147 # toalloc:2148 free:{1: 250} chanlimit:250 correction:2147
if toalloc > sum(chanfree[0].values()): if toalloc > sum(chanfree[0].values()):
sum_free = sum(chanfree[0].values()) # 250 sum_free = sum(chanfree[0].values()) # 250
chans_not_covered = toalloc - sum_free # 2148 - 250 = 1898 chans_not_covered = toalloc - sum_free # 2148 - 250 = 1898
relays_needed = chans_not_covered / chanfree[1] # 1898 / 250 = 7.592 relays_needed = chans_not_covered / chanfree[1] # 1898 / 250 = 7.592
relays_needed_rounded = ceil(relays_needed) correction = ceil(relays_needed)
debug(f"emptyChanAllocate() secondary allocation sum_free:{sum_free} chans_not_covered:{chans_not_covered} relays_needed:{relays_needed} relays_needed_rounded:{relays_needed_rounded}") debug(
#correction = round(toalloc - sum(chanfree[0].values()) / chanfree[1]) (
correction = relays_needed_rounded f"emptyChanAllocate() secondary allocation sum_free:{sum_free} "
debug(f"emptyChanAllocate() not enough free channels: toalloc:{toalloc} free:{chanfree[0]} chanlimit:{chanfree[1]} correction:{correction}") f"chans_not_covered:{chans_not_covered} relays_needed:{relays_needed} "
f"correction:{correction}"
)
)
debug(
(
f"emptyChanAllocate() not enough free channels: toalloc:{toalloc} "
f"free:{chanfree[0]} chanlimit:{chanfree[1]} correction:{correction}"
)
)
warn("Ran out of channel spaces, provisioning additional %i relays for %s" % (correction, net)) warn("Ran out of channel spaces, provisioning additional %i relays for %s" % (correction, net))
modules.provision.provisionMultipleRelays(net, correction) modules.provision.provisionMultipleRelays(net, correction)
return False return False