if m.group('category').endswith(':'):
# "stderr crunchstat: notice: ..."
continue
- elif m.group('category') in ('error', 'caught', 'Running'):
+ elif m.group('category') in ('error', 'caught'):
continue
- elif m.group('category') in ['read', 'open', 'cgroup', 'CID']:
+ elif m.group('category') in ('read', 'open', 'cgroup', 'CID', 'Running'):
# "stderr crunchstat: read /proc/1234/net/dev: ..."
# (old logs are less careful with unprefixed error messages)
continue
else:
stats[stat] = int(val)
except ValueError as e:
- logger.warning('Error parsing {} stat: {!r}'.format(
- stat, e))
+ logger.warning(
+ 'Error parsing value %r (stat %r, category %r): %r',
+ val, stat, category, e)
+ logger.warning('%s', line)
continue
if 'user' in stats or 'sys' in stats:
stats['user+sys'] = stats.get('user', 0) + stats.get('sys', 0)
def text_report(self):
txt = ''
d = self._descendants()
- for cname, child in d.iteritems():
+ for child in d.itervalues():
if len(d) > 1:
txt += '### Summary for {} ({})\n'.format(
child.label, child.process['uuid'])
class ContainerTreeSummarizer(MultiSummarizer):
- def __init__(self, root, **kwargs):
+ def __init__(self, root, skip_child_jobs=False, **kwargs):
arv = arvados.api('v1', model=OrderedJsonModel())
label = kwargs.pop('label', None) or root.get('name') or root['uuid']
page_filters = []
while True:
- items = arv.container_requests().index(
+ child_crs = arv.container_requests().index(
order=['uuid asc'],
filters=page_filters+[
['requesting_container_uuid', '=', current['uuid']]],
- ).execute()['items']
- if not items:
+ ).execute()
+ if not child_crs['items']:
break
- page_filters = [['uuid', '>', items[-1]['uuid']]]
- for cr in items:
+ elif skip_child_jobs:
+ logger.warning('%s: omitting stats from %d child containers'
+ ' because --skip-child-jobs flag is on',
+ label, child_crs['items_available'])
+ break
+ page_filters = [['uuid', '>', child_crs['items'][-1]['uuid']]]
+ for cr in child_crs['items']:
if cr['container_uuid']:
logger.debug('%s: container req %s', current['uuid'], cr['uuid'])
cr['name'] = cr.get('name') or cr['uuid']