Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Try again to squash memory leak in fedmsg-map.

Browse source
This commit is contained in:
Ralph Bean 2015-06-01 19:41:45 +00:00
parent 1b6dd66d03
commit 1123b0dc80
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
roles/collectd/fedmsg-activation/files/fedmsg-map.py
View file

@ -22,8 +22,6 @@ for_collectd = 'verbose' not in sys.argv
active = collections.defaultdict(list) active = collections.defaultdict(list)
inactive = collections.defaultdict(list) inactive = collections.defaultdict(list)
pool = multiprocessing.pool.ThreadPool(25)
def info(content="\n"): def info(content="\n"):
if not for_collectd: if not for_collectd:
sys.stdout.write(content) sys.stdout.write(content)
@ -53,10 +51,24 @@ def scan_one(item):
def scan_all(): def scan_all():
global active
global inactive
del active
del inactive
active = collections.defaultdict(list)
inactive = collections.defaultdict(list)
items = [(name, addr) items = [(name, addr)
for name, endpoints in config['endpoints'].items() for name, endpoints in config['endpoints'].items()
for addr in endpoints] for addr in endpoints]
# There is likely overhead in creating and destroying this thing, but we have
# memory leaks to track down.
pool = multiprocessing.pool.ThreadPool(25)
pool.map(scan_one, items) pool.map(scan_one, items)
pool.close()
info() info()
@ -129,5 +141,3 @@ else:
print(output) print(output)
if interval - delta > 0: if interval - delta > 0:
time.sleep(interval - delta) time.sleep(interval - delta)
pool.close()