From 8e92e25b62ca108de775362e6d2981e54535f094 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Tue, 22 May 2018 15:21:45 +0900
Subject: [PATCH] Remvoe disable_ddl_transaction! and redandant RecordNotUnique
 exception rescue

---
 ...160449_add_pipeline_iid_to_ci_pipelines.rb |  2 --
 lib/gitlab/ci/pipeline/chain/create.rb        |  2 +-
 .../gitlab/ci/pipeline/chain/create_spec.rb   | 27 +++++--------------
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb b/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb
index d732116e9ce..e8f0c91d612 100644
--- a/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb
+++ b/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb
@@ -3,8 +3,6 @@ class AddPipelineIidToCiPipelines < ActiveRecord::Migration
 
   DOWNTIME = false
 
-  disable_ddl_transaction!
-
   def up
     add_column :ci_pipelines, :iid, :integer
   end
diff --git a/lib/gitlab/ci/pipeline/chain/create.rb b/lib/gitlab/ci/pipeline/chain/create.rb
index e62056766bd..918a0d151fc 100644
--- a/lib/gitlab/ci/pipeline/chain/create.rb
+++ b/lib/gitlab/ci/pipeline/chain/create.rb
@@ -23,7 +23,7 @@ module Gitlab
                 end
               end
             end
-          rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique => e
+          rescue ActiveRecord::RecordInvalid => e
             error("Failed to persist the pipeline: #{e}")
           end
 
diff --git a/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb
index 9c0bedfb6b7..de69a65aee4 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb
@@ -37,17 +37,6 @@ describe Gitlab::Ci::Pipeline::Chain::Create do
   end
 
   context 'when pipeline has validation errors' do
-    shared_examples_for 'expectations' do
-      it 'breaks the chain' do
-        expect(step.break?).to be true
-      end
-
-      it 'appends validation error' do
-        expect(pipeline.errors.to_a)
-          .to include /Failed to persist the pipeline/
-      end
-    end
-
     context 'when ref is nil' do
       let(:pipeline) do
         build(:ci_pipeline, project: project, ref: nil)
@@ -57,18 +46,14 @@ describe Gitlab::Ci::Pipeline::Chain::Create do
         step.perform!
       end
 
-      it_behaves_like 'expectations'
-    end
-
-    context 'when pipeline has a duplicate iid' do
-      before do
-        allow_any_instance_of(Ci::Pipeline).to receive(:ensure_project_iid!) { |p| p.send(:write_attribute, :iid, 1) }
-        create(:ci_pipeline, project: project)
-
-        step.perform!
+      it 'breaks the chain' do
+        expect(step.break?).to be true
       end
 
-      it_behaves_like 'expectations'
+      it 'appends validation error' do
+        expect(pipeline.errors.to_a)
+          .to include /Failed to persist the pipeline/
+      end
     end
   end
 end
-- 
GitLab