Merge branch 'dm-lock-version-null' into 'master'

Support both 0 and NULL lock_versions

See merge request gitlab-org/gitlab-ce!24050

2 files changed, 47 insertions, 1 deletions

diff --git a/spec/initializers/active_record_locking_spec.rb b/spec/initializers/active_record_locking_spec.rb
new file mode 100644
index 00000000000..5a16aef78e6
--- /dev/null
+++ b/spec/initializers/active_record_locking_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'ActiveRecord locking' do
+  let(:issue) { create(:issue) }
+
+  shared_examples 'locked model' do
+    before do
+      issue.update_column(:lock_version, start_lock_version)
+    end
+
+    it 'can be updated' do
+      issue.update(title: "New title")
+
+      expect(issue.reload.lock_version).to eq(new_lock_version)
+    end
+
+    it 'can be deleted' do
+      expect { issue.destroy }.to change { Issue.count }.by(-1)
+    end
+  end
+
+  context 'when lock_version is NULL' do
+    let(:start_lock_version) { nil }
+    let(:new_lock_version) { 1 }
+
+    it_behaves_like 'locked model'
+  end
+
+  context 'when lock_version is 0' do
+    let(:start_lock_version) { 0 }
+    let(:new_lock_version) { 1 }
+
+    it_behaves_like 'locked model'
+  end
+
+  context 'when lock_version is 1' do
+    let(:start_lock_version) { 1 }
+    let(:new_lock_version) { 2 }
+
+    it_behaves_like 'locked model'
+  end
+end
diff --git a/spec/services/ci/register_job_service_spec.rb b/spec/services/ci/register_job_service_spec.rb
index 56e2a405bcd..9d65ac15213 100644
--- a/spec/services/ci/register_job_service_spec.rb
+++ b/spec/services/ci/register_job_service_spec.rb
@@ -244,7 +244,9 @@ module Ci
 
       context 'when first build is stalled' do
         before do
-          pending_job.update(lock_version: 0)
+          allow_any_instance_of(Ci::RegisterJobService).to receive(:assign_runner!).and_call_original
+          allow_any_instance_of(Ci::RegisterJobService).to receive(:assign_runner!)
+            .with(pending_job, anything).and_raise(ActiveRecord::StaleObjectError)
         end
 
         subject { described_class.new(specific_runner).execute }