aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 23:24:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

pytest: don't valgrind plugins under CI if many nodes.

Browse Source 
Just pick one at random to trace fully.

Eg. test_gossip.py::test_getroute_exclude (creates 5 nodes)

Before:
	%MEM VSZ      RSS
	27.6 15941008 5106764

After:
	%MEM VSZ      RSS
	15.6 12234844 3009016

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2021-11-27 21:47:59 +10:30
committed by ZmnSCPxj, ZmnSCPxj jxPCSmnZ
parent 7a6fd70078
commit e6ba66063e
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/pyln-testing/pyln/testing/utils.py
View File

@@ -640,6 +640,7 @@ class LightningNode(object):
allow_bad_gossip=False, allow_bad_gossip=False,
db=None, port=None, disconnect=None, random_hsm=None, options=None, db=None, port=None, disconnect=None, random_hsm=None, options=None,
jsonschemas={}, jsonschemas={},
valgrind_plugins=True,
**kwargs): **kwargs):
self.bitcoin = bitcoind self.bitcoin = bitcoind
self.executor = executor self.executor = executor
@@ -690,11 +691,14 @@ class LightningNode(object):
if dsn is not None: if dsn is not None:
self.daemon.opts['wallet'] = dsn self.daemon.opts['wallet'] = dsn
if valgrind: if valgrind:
trace_skip_pattern = '*python*,*bitcoin-cli*,*elements-cli*'
if not valgrind_plugins:
trace_skip_pattern += ',*plugins*'
self.daemon.cmd_prefix = [ self.daemon.cmd_prefix = [
'valgrind', 'valgrind',
'-q', '-q',
'--trace-children=yes', '--trace-children=yes',
'--trace-children-skip=*python*,*bitcoin-cli*,*elements-cli*', '--trace-children-skip={}'.format(trace_skip_pattern),
'--error-exitcode=7', '--error-exitcode=7',
'--log-file={}/valgrind-errors.%p'.format(self.daemon.lightning_dir) '--log-file={}/valgrind-errors.%p'.format(self.daemon.lightning_dir)
] ]
@@ -1280,12 +1284,20 @@ class NodeFactory(object):
assert len(opts) == num_nodes assert len(opts) == num_nodes
# Only trace one random node's plugins, to avoid OOM.
if SLOW_MACHINE:
valgrind_plugins = [False] * num_nodes
valgrind_plugins[random.randint(0, num_nodes - 1)] = True
else:
valgrind_plugins = [True] * num_nodes
jobs = [] jobs = []
for i in range(num_nodes): for i in range(num_nodes):
node_opts, cli_opts = self.split_options(opts[i]) node_opts, cli_opts = self.split_options(opts[i])
jobs.append(self.executor.submit( jobs.append(self.executor.submit(
self.get_node, options=cli_opts, self.get_node, options=cli_opts,
node_id=self.get_node_id(), **node_opts node_id=self.get_node_id(), **node_opts,
valgrind_plugins=valgrind_plugins[i]
)) ))
return [j.result() for j in jobs] return [j.result() for j in jobs]