replace --period by --interval in psi2log

This commit is contained in:
Alexey Avramov 2020-02-19 00:11:39 +09:00
parent f381bb9a67
commit bf241f247c

View File

@ -134,16 +134,16 @@ parser = ArgumentParser()
parser.add_argument( parser.add_argument(
'-t', '-t',
'--target', '--target',
help="""target (cgroup2 or SYTSTEM_WIDE)""", help="""target (cgroup_v2 or SYTSTEM_WIDE)""",
default='SYSTEM_WIDE', default='SYSTEM_WIDE',
type=str type=str
) )
parser.add_argument( parser.add_argument(
'-p', '-i',
'--period', '--interval',
help="""period in sec""", help="""interval in sec""",
default=2, default=2,
type=float type=float
) )
@ -162,7 +162,7 @@ args = parser.parse_args()
target = args.target target = args.target
period = args.period interval = args.interval
log_file = args.log log_file = args.log
@ -188,7 +188,7 @@ if separate_log:
log('Starting psi2log') log('Starting psi2log')
log('target: {}'.format(target)) log('target: {}'.format(target))
log('period: {}'.format(period)) log('interval: {} sec'.format(interval))
if log_file is not None: if log_file is not None:
log('log file: {}'.format(log_file)) log('log file: {}'.format(log_file))
@ -220,7 +220,7 @@ else:
else: else:
log('cgroup2 mountpoint: {}'.format(cgroup2_mountpoint)) log('cgroup_v2 mountpoint: {}'.format(cgroup2_mountpoint))
cpu_file = cgroup2_mountpoint + target + "/cpu.pressure" cpu_file = cgroup2_mountpoint + target + "/cpu.pressure"
memory_file = cgroup2_mountpoint + target + "/memory.pressure" memory_file = cgroup2_mountpoint + target + "/memory.pressure"
@ -230,8 +230,8 @@ else:
mlockall() mlockall()
log('----------------------------------------------------------------------' log('======================================================================'
'--------------------------------------------') '============================================')
log(' some cpu pressure || some memory pressure | full memory pressure ||' log(' some cpu pressure || some memory pressure | full memory pressure ||'
' some io pressure | full io pressure') ' some io pressure | full io pressure')
log('---------------------||----------------------|----------------------||' log('---------------------||----------------------|----------------------||'
@ -249,18 +249,18 @@ while True:
if not os.path.exists(cpu_file): if not os.path.exists(cpu_file):
log('ERROR: cpu pressure file does not exist: {}'.format(cpu_file)) log('ERROR: cpu pressure file does not exist: {}'.format(cpu_file))
sleep(period) sleep(interval)
continue continue
if not os.path.exists(memory_file): if not os.path.exists(memory_file):
log('ERROR: memory pressure file does not exist: {}'.format( log('ERROR: memory pressure file does not exist: {}'.format(
memory_file)) memory_file))
sleep(period) sleep(interval)
continue continue
if not os.path.exists(io_file): if not os.path.exists(io_file):
log('ERROR: io pressure file does not exist: {}'.format(cpu_file)) log('ERROR: io pressure file does not exist: {}'.format(cpu_file))
sleep(period) sleep(interval)
continue continue
(c_some_avg10, c_some_avg60, c_some_avg300 (c_some_avg10, c_some_avg60, c_some_avg300
@ -367,4 +367,4 @@ while True:
peaks_dict['i_full_avg300'] = i_full_avg300 peaks_dict['i_full_avg300'] = i_full_avg300
stdout.flush() stdout.flush()
sleep(period) sleep(interval)