Fix rsync with ionice command building

Author: ikbenale

CHANGELOG

@@ -1,4 +1,5 @@
 v3.6.4
+ - Fix rsync with ionice command building
  - Fix short circuit logic between rsync with and without ionice for storage migrations
 
 v3.6.3

lib/gitlab_projects.rb

@@ -318,16 +318,12 @@ def mv_storage
  $logger.info "Syncing project #{@project_name} from <#{full_path}> to <#{new_full_path}>."
 
  # Set a low IO priority with ionice to not choke the server on moves
- rsync_path = 'ionice -c2 -n7 rsync'
- result = system(*%W(#{rsync_path} -a --delete --rsync-path="#{rsync_path}" #{source_path} #{new_full_path}))
-
- if result
+ if rsync(source_path, new_full_path, 'ionice -c2 -n7 rsync')
  true
  else
  # If the command fails with `ionice` (maybe because we're on a OS X
  # development machine), try again without `ionice`.
- rsync_path = 'rsync'
- system(*%W(#{rsync_path} -a --delete --rsync-path="#{rsync_path}" #{source_path} #{new_full_path}))
+ rsync(source_path, new_full_path)
  end
  else
  $logger.error "mv-storage failed: source path <#{full_path}> is waiting for pushes to finish."
@@ -393,4 +389,9 @@ def wait_for_pushes
  def gitlab_reference_counter
  @gitlab_reference_counter ||= GitlabReferenceCounter.new(full_path)
  end
+
+ def rsync(src, dest, rsync_path = 'rsync')
+ command = rsync_path.split + %W(-a --delete --rsync-path="#{rsync_path}" #{src} #{dest})
+ system(*command)
+ end
 end

spec/gitlab_projects_spec.rb

@@ -229,7 +229,7 @@
 
  it "should attempt rsync with ionice first" do
  expect(gl_projects).to receive(:system).with(
- 'ionice -c2 -n7 rsync', '-a', '--delete', '--rsync-path="ionice -c2 -n7 rsync"',
+ 'ionice', '-c2', '-n7', 'rsync', '-a', '--delete', '--rsync-path="ionice -c2 -n7 rsync"',
  "#{tmp_repo_path}/", new_repo_path
  ).and_return(true)
 
@@ -238,7 +238,7 @@
 
  it "should attempt rsync without ionice if with ionice fails" do
  expect(gl_projects).to receive(:system).with(
- 'ionice -c2 -n7 rsync', '-a', '--delete', '--rsync-path="ionice -c2 -n7 rsync"',
+ 'ionice', '-c2', '-n7', 'rsync', '-a', '--delete', '--rsync-path="ionice -c2 -n7 rsync"',
  "#{tmp_repo_path}/", new_repo_path
  ).and_return(false)
 
@@ -251,7 +251,7 @@
 
  it "should fail if both rsync attempts fail" do
  expect(gl_projects).to receive(:system).with(
- 'ionice -c2 -n7 rsync', '-a', '--delete', '--rsync-path="ionice -c2 -n7 rsync"',
+ 'ionice', '-c2', '-n7', 'rsync', '-a', '--delete', '--rsync-path="ionice -c2 -n7 rsync"',
  "#{tmp_repo_path}/", new_repo_path
  ).and_return(false)