Merge branch 'concurent_runners' into 'master'

Resolve situation with concurent runners registration

https://dev.gitlab.org/gitlab/gitlab-ci/issues/209

https://github.com/gitlabhq/gitlab-ci/issues/458

See merge request !82

1 files changed, 6 insertions, 1 deletions

diff --git a/app/services/register_build_service.rb b/app/services/register_build_service.rb
index cbb9b5f..e0f1659 100644
--- a/app/services/register_build_service.rb
+++ b/app/services/register_build_service.rb
@@ -25,7 +25,9 @@ class RegisterBuildService
       end
 
     if build
-      ActiveRecord::Base.transaction do
+      # In case when 2 runners try to assign the same build, second runner will be declined
+      # with StateMachine::InvalidTransition in run! method.
+      build.with_lock do
         build.runner_id = current_runner.id
         build.save!
         build.run!
@@ -33,5 +35,8 @@ class RegisterBuildService
     end
 
     build
+
+  rescue StateMachine::InvalidTransition
+    nil
   end
 end