| Message ID | 20240719200234.88661-1-crwood@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | rteval: Fix default measurement config | expand |
On Fri, 19 Jul 2024, Crystal Wood wrote: > Commit 761741d15d08e ("rteval: rteval-cmd: Some style changes suggested by pylint-3") > accidentally indented the check for missing measurement config, such that > it became part of the missing load conditional. This was harmless if > the cnofig file was missing entirely, but not if the config file > exists but the measurement section is empty. > > Also, remove timerlat from the default as it conflicts with cyclictest, > and we're not quite ready to make timerlat the default. > > Signed-off-by: Crystal Wood <crwood@redhat.com> > --- > rteval-cmd | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/rteval-cmd b/rteval-cmd > index 36b167a034e5..19c82a0b64b3 100755 > --- a/rteval-cmd > +++ b/rteval-cmd > @@ -247,11 +247,10 @@ if __name__ == '__main__': > 'hackbench' : 'module', > 'stressng' : 'module'}) > > - if not config.HasSection('measurement'): > - config.AppendConfig('measurement', { > - 'cyclictest' : 'module', > - 'timerlat' : 'module', > - 'sysstat' : 'module'}) > + if not config.HasSection('measurement'): > + config.AppendConfig('measurement', { > + 'cyclictest' : 'module', > + 'sysstat' : 'module'}) > > # Prepare log levels before loading modules, not to have unwanted log messages > rtevcfg = config.GetSection('rteval') > -- > 2.45.2 > > > Signed-off-by: John Kacur <jkacur@redhat.com>
diff --git a/rteval-cmd b/rteval-cmd index 36b167a034e5..19c82a0b64b3 100755 --- a/rteval-cmd +++ b/rteval-cmd @@ -247,11 +247,10 @@ if __name__ == '__main__': 'hackbench' : 'module', 'stressng' : 'module'}) - if not config.HasSection('measurement'): - config.AppendConfig('measurement', { - 'cyclictest' : 'module', - 'timerlat' : 'module', - 'sysstat' : 'module'}) + if not config.HasSection('measurement'): + config.AppendConfig('measurement', { + 'cyclictest' : 'module', + 'sysstat' : 'module'}) # Prepare log levels before loading modules, not to have unwanted log messages rtevcfg = config.GetSection('rteval')
Commit 761741d15d08e ("rteval: rteval-cmd: Some style changes suggested by pylint-3") accidentally indented the check for missing measurement config, such that it became part of the missing load conditional. This was harmless if the cnofig file was missing entirely, but not if the config file exists but the measurement section is empty. Also, remove timerlat from the default as it conflicts with cyclictest, and we're not quite ready to make timerlat the default. Signed-off-by: Crystal Wood <crwood@redhat.com> --- rteval-cmd | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)