Commit 17ce21d7 authored by Michael Kozono's avatar Michael Kozono

Use ionice absolute path

parent f5fa3987
...@@ -80,14 +80,15 @@ module Gitlab ...@@ -80,14 +80,15 @@ module Gitlab
def build_find_command(search_dir) def build_find_command(search_dir)
cmd = %W[find #{search_dir} -type f ! ( -path #{EXCLUDED_HASHED_UPLOADS_PATH} -prune ) ! ( -path #{EXCLUDED_TMP_UPLOADS_PATH} -prune ) -print0] cmd = %W[find #{search_dir} -type f ! ( -path #{EXCLUDED_HASHED_UPLOADS_PATH} -prune ) ! ( -path #{EXCLUDED_TMP_UPLOADS_PATH} -prune ) -print0]
cmd = %w[ionice -c Idle] + cmd if ionice_is_available? ionice = which_ionice
cmd = %W[#{ionice} -c Idle] + cmd if ionice
Rails.logger.info "PrepareUntrackedUploads find command: \"#{cmd.join(' ')}\"" Rails.logger.info "PrepareUntrackedUploads find command: \"#{cmd.join(' ')}\""
cmd cmd
end end
def ionice_is_available? def which_ionice
Gitlab::Utils.which('ionice') Gitlab::Utils.which('ionice')
rescue StandardError rescue StandardError
# In this case, returning false is relatively safe, even though it isn't very nice # In this case, returning false is relatively safe, even though it isn't very nice
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment