From 2e7ab637bf8646734bd0c5a4dd11e60062a05206 Mon Sep 17 00:00:00 2001 From: Yaron Kaikov Date: Mon, 12 Sep 2022 13:54:28 +0300 Subject: [PATCH] scylla_install_image:remove writeback_cache option Currently we're setting write_back_cache parameter in perftune for preinstalled Scylla images. This is bogus approach and should be disabled (see scylladb/seastar#1008). We shouldn't set this setting at all (this is 3-state option, where not-set is the recommended one). Closes: https://github.com/scylladb/scylla-pkg/issues/3099 --- packer/scylla_install_image | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packer/scylla_install_image b/packer/scylla_install_image index 1f2abef1..a5e3490d 100755 --- a/packer/scylla_install_image +++ b/packer/scylla_install_image @@ -122,17 +122,14 @@ if __name__ == '__main__': with open('/etc/chrony/sources.d/ntp-pool.sources', 'w') as f: f.write('pool time.aws.com iburst\n') - sysconfig_opt = '' kernel_opt = '' grub_variable = 'GRUB_CMDLINE_LINUX_DEFAULT' elif args.target_cloud == 'gce': # align with other clouds image run('apt-get purge -y rsyslog', shell=True, check=True) - sysconfig_opt = '--disable-writeback-cache' kernel_opt = '' grub_variable = 'GRUB_CMDLINE_LINUX_DEFAULT' elif args.target_cloud == 'azure': - sysconfig_opt = '--disable-writeback-cache' kernel_opt = ' rootdelay=300' grub_variable = 'GRUB_CMDLINE_LINUX' @@ -146,7 +143,7 @@ if __name__ == '__main__': # so we want to enable it here run('/opt/scylladb/scripts/scylla_cpuscaling_setup --force', shell=True, check=True) - run(f'/opt/scylladb/scripts/scylla_sysconfig_setup --set-clocksource {sysconfig_opt}', shell=True, check=True) + run(f'/opt/scylladb/scripts/scylla_sysconfig_setup --set-clocksource', shell=True, check=True) if args.target_cloud == 'aws' or args.target_cloud == 'gce': run(f'/opt/scylladb/scripts/scylla_swap_setup --swap-size-bytes {half_of_diskfree()} --swap-directory /', shell=True, check=True) run('/opt/scylladb/scripts/scylla_coredump_setup', shell=True, check=True)