Vlad Zolotarov
<vladz@scylladb.com>unread,Sep 19, 2023, 1:50:14 PM9/19/23Sign in to reply to author
Sign in to forward
You do not have permission to delete messages in this group
to seastar-dev@googlegroups.com, Vlad Zolotarov
perftune.py supports a few 'list' configurables and we want such values
to appear in the same order every time we invoke 'perftune.py --dump-options-file ...'
with the same set of arguments.
This is particularly important for tools that detect configuration drift - with this
patch a simple 'diff' can be used.
Fixes #1842
---
scripts/perftune.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/perftune.py b/scripts/perftune.py
index a49b60697..538dabcba 100755
--- a/scripts/perftune.py
+++ b/scripts/perftune.py
@@ -1656,13 +1656,13 @@ def dump_config(prog_args):
prog_options['irq_cpu_mask'] = PerfTunerBase.irqs_cpu_mask_for_mode(mode, prog_args.cpu_mask)
if prog_args.nics:
- prog_options['nic'] = list(set(prog_args.nics))
+ prog_options['nic'] = sorted(set(prog_args.nics))
if prog_args.tune_clock:
prog_options['tune_clock'] = prog_args.tune_clock
if prog_args.tune:
- prog_options['tune'] = list(set(prog_args.tune))
+ prog_options['tune'] = sorted(set(prog_args.tune))
if prog_args.cpu_mask:
prog_options['cpu_mask'] = prog_args.cpu_mask
@@ -1671,10 +1671,10 @@ def dump_config(prog_args):
prog_options['irq_cpu_mask'] = prog_args.irq_cpu_mask
if prog_args.dirs:
- prog_options['dir'] = list(set(prog_args.dirs))
+ prog_options['dir'] = sorted(set(prog_args.dirs))
if prog_args.devs:
- prog_options['dev'] = list(set(prog_args.devs))
+ prog_options['dev'] = sorted(set(prog_args.devs))
if prog_args.set_write_back is not None:
prog_options['write_back_cache'] = prog_args.set_write_back
--
2.34.1