We have problem to run fstrim with nomerges=2, so we need to change the parameter to 1 during fstrim execution. To do this, this fix changes follow things: - revert dropping scylla_fstrim on Ubuntu 16.04/CentOS - disable distribution provided fstrim script - enable scylla_fstrim on all distributions - introduce --set-nomerges on scylla-blocktune - scylla_fstrim call scylla-blocktune by following order: - 'scylla-blocktune --set-nomerges 1' - 'fstrim' for each devices - 'scylla-blocktune --set-nomerges 2' Fixes #2649 Signed-off-by: Takuya ASADA <syuu@scylladb.com> Message-Id: <1501531393-21109-1-git-send-email-syuu@scylladb.com>