diff --git a/scripts/verify_stack.py b/scripts/verify_stack.py index 6231debc..ae2e1f99 100644 --- a/scripts/verify_stack.py +++ b/scripts/verify_stack.py @@ -68,7 +68,15 @@ def memory(): for cid in replicas(): status=docker('exec',cid,'python','-c',"print(open('/proc/1/status').read())") data[cid]={k:int(next(line.split()[1] for line in status.splitlines() if line.startswith(k+':'))) for k in ('VmRSS','VmHWM')} - limits=json.loads(docker('exec',cid,'python','-c',"import json,pathlib; p=pathlib.Path('/sys/fs/cgroup'); print(json.dumps({'peak_bytes':int((p/'memory.peak').read_text()),'events':dict(line.split() for line in (p/'memory.events').read_text().splitlines())}))")) + probe="""import json,pathlib +p=pathlib.Path('/sys/fs/cgroup') +if (p/'memory.peak').exists(): + result={'version':2,'peak_bytes':int((p/'memory.peak').read_text()),'events':dict(line.split() for line in (p/'memory.events').read_text().splitlines())} +else: + p=p/'memory' + result={'version':1,'peak_bytes':int((p/'memory.max_usage_in_bytes').read_text()),'failcnt':int((p/'memory.failcnt').read_text()),'oom_control':(p/'memory.oom_control').read_text()} +print(json.dumps(result))""" + limits=json.loads(docker('exec',cid,'python','-c',probe)) data[cid]['cgroup']=limits return data