From a990c283b0532266b2966ae0d9a257dca34b291a Mon Sep 17 00:00:00 2001 From: Xinyu Huang Date: Fri, 26 Jul 2024 14:54:57 +0800 Subject: [PATCH] tools/crimson: fix cyanstore/memstore settings Signed-off-by: Xinyu Huang --- tools/crimson/crimson_bench_tool.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/crimson/crimson_bench_tool.py b/tools/crimson/crimson_bench_tool.py index b3628153..dcd57006 100755 --- a/tools/crimson/crimson_bench_tool.py +++ b/tools/crimson/crimson_bench_tool.py @@ -1249,8 +1249,8 @@ def general_pre_processing(self, tester_id): self.additional_result['alien_thread_cpu_cores'] = crimson_alien_thread_cpu_cores elif backend == "memstore": osd_core_num = self.osd_core_num - command += " -o 'memstore_device_bytes = 8G'" - self.additional_result['memstore_device_bytes'] = '8G' + command += f" -o 'memstore_device_bytes = {self.args.memstore_device_bytes}'" + self.additional_result['memstore_device_bytes'] = self.args.memstore_device_bytes elif backend == "seastore": osd_core_num = self.osd_core_num command += " -o 'seastore_cache_lru_size = 512M'" @@ -1269,6 +1269,10 @@ def general_pre_processing(self, tester_id): command += f" --crimson-smp {int(osd_core_num / self.args.osd)}" else: # classic + if backend == "memstore": + osd_core_num = self.osd_core_num + command += f" -o 'memstore_device_bytes = {self.args.memstore_device_bytes}'" + self.additional_result['memstore_device_bytes'] = self.args.memstore_device_bytes if self.osd_core_num % self.args.osd != 0: raise Exception("osd cores should be an integer multiple of osd") # classic osd cores bounding will be setting after ceph start @@ -1944,6 +1948,10 @@ def not_exist(tgt): type=int, default=None, help='set ms_async_op_threads.') + parser.add_argument('--memstore-device-bytes', + type=str + default='8G' + help='set memstore_device_bytes for memstore') parser.add_argument('--ceph-config', '--config', type=str, default=None,