diff --git a/gui/services/migrations/0026_delete_vm_kmem_size_tunable.py b/gui/services/migrations/0026_delete_vm_kmem_size_tunable.py new file mode 100644 index 000000000000..9b537cbf25de --- /dev/null +++ b/gui/services/migrations/0026_delete_vm_kmem_size_tunable.py @@ -0,0 +1,22 @@ +from django.db import migrations + + +def delete_vm_kmem_size(apps, schemaeditor): + tunables = apps.get_model('system', 'tunable') + kmem_size_tunable = tunables.objects.filter(tun_var='vm.kmem_size', + tun_comment='Generated by autotune') + kmem_size_tunable.delete() + + +class Migration(migration.Migration): + + dependencies = [ + ('services', '0026_s3_fields'), + ] + + operations = [ + migrations.RunPython( + delete_vm_kmem_size + ), + ] + diff --git a/src/autotune/files/autotune.py b/src/autotune/files/autotune.py index 3449cf5e3861..f91f047fdc6b 100755 --- a/src/autotune/files/autotune.py +++ b/src/autotune/files/autotune.py @@ -97,25 +97,6 @@ def popen(cmd): return p.communicate()[0] -def get_interfaces(include_fake=False): - - interfaces = popen('ifconfig -l') - - fake_interfaces = ( - 'ipfw', - 'lo', - 'pflog', - 'pfsync', - ) - - interfaces = interfaces.split() - - if include_fake: - return interfaces - return filter(lambda i: not re.match('^(%s)\d+$' - % ('|'.join(fake_interfaces), ), i), interfaces) - - def sysctl(oid): """Quick and dirty means of doing sysctl -n""" return popen('sysctl -n %s' % (oid, )) @@ -134,7 +115,6 @@ def sysctl_int(oid): # as a valid choice to the -c option. DEF_KNOBS = { 'loader': { - 'vm.kmem_size', 'vfs.zfs.dirty_data_max_max', }, 'sysctl': { @@ -167,10 +147,6 @@ def sysctl_int(oid): } -def guess_vm_kmem_size(): - return int(1.25 * HW_PHYSMEM) - - def guess_vfs_zfs_dirty_data_max_max(): if TRUENAS and hardware[0].startswith("M"): return 12 * GB @@ -352,7 +328,7 @@ def guess_vfs_zfs_metaslab_lba_weighting_enabled(): def guess_vfs_zfs_zfetch_max_distance(): - return 33554432 + return 32 * MB def main(argv):