Commit 44915d43 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Move code behind feature flag

Puts the changes under the use_insert_all_in_internal_id feature flag
parent 564b5ea7
...@@ -223,6 +223,7 @@ class InternalId < ApplicationRecord ...@@ -223,6 +223,7 @@ class InternalId < ApplicationRecord
# If another process was faster in doing this, we'll end up with that record # If another process was faster in doing this, we'll end up with that record
# when we do the lookup after the insert. # when we do the lookup after the insert.
def create_record def create_record
if Feature.enabled?(:use_insert_all_in_internal_id, default_enabled: :yaml)
scope[:project].save! if scope[:project] && !scope[:project].persisted? scope[:project].save! if scope[:project] && !scope[:project].persisted?
scope[:namespace].save! if scope[:namespace] && !scope[:namespace].persisted? scope[:namespace].save! if scope[:namespace] && !scope[:namespace].persisted?
...@@ -235,9 +236,22 @@ class InternalId < ApplicationRecord ...@@ -235,9 +236,22 @@ class InternalId < ApplicationRecord
InternalId.insert_all([attributes]) InternalId.insert_all([attributes])
lookup
else
begin
subject.transaction(requires_new: true) do
InternalId.create!(
**scope,
usage: usage_value,
last_value: initial_value(subject, scope)
)
end
rescue ActiveRecord::RecordNotUnique
lookup lookup
end end
end end
end
end
class ImplicitlyLockingInternalIdGenerator class ImplicitlyLockingInternalIdGenerator
# Generate next internal id for a given scope and usage. # Generate next internal id for a given scope and usage.
...@@ -330,6 +344,7 @@ class InternalId < ApplicationRecord ...@@ -330,6 +344,7 @@ class InternalId < ApplicationRecord
end end
def create_record!(subject, scope, usage, value) def create_record!(subject, scope, usage, value)
if Feature.enabled?(:use_insert_all_in_internal_id, default_enabled: :yaml)
scope[:project].save! if scope[:project] && !scope[:project].persisted? scope[:project].save! if scope[:project] && !scope[:project].persisted?
scope[:namespace].save! if scope[:namespace] && !scope[:namespace].persisted? scope[:namespace].save! if scope[:namespace] && !scope[:namespace].persisted?
...@@ -345,6 +360,16 @@ class InternalId < ApplicationRecord ...@@ -345,6 +360,16 @@ class InternalId < ApplicationRecord
raise RecordAlreadyExists if result.empty? raise RecordAlreadyExists if result.empty?
value value
else
begin
subject.transaction(requires_new: true) do
internal_id = InternalId.create!(**scope, usage: usage, last_value: value)
internal_id.last_value
end
rescue ActiveRecord::RecordNotUnique
raise RecordAlreadyExists
end
end
end end
def arel_table def arel_table
......
---
name: use_insert_all_in_internal_id
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68617
rollout_issue_url:
milestone: '14.3'
type: development
group: group::project management
default_enabled: false
...@@ -238,21 +238,49 @@ RSpec.describe InternalId do ...@@ -238,21 +238,49 @@ RSpec.describe InternalId do
end end
end end
context 'when the feature flag is disabled' do context 'when the explicit locking feature flag is disabled' do
before do before do
stub_feature_flags(generate_iids_without_explicit_locking: false) stub_feature_flags(generate_iids_without_explicit_locking: false)
end end
context 'when the insert all feature flag is enabled' do
before do
stub_feature_flags(use_insert_all_in_internal_id: true)
end
it_behaves_like 'a monotonically increasing id generator'
end
context 'when the insert all feature flag is disabled' do
before do
stub_feature_flags(use_insert_all_in_internal_id: false)
end
it_behaves_like 'a monotonically increasing id generator' it_behaves_like 'a monotonically increasing id generator'
end end
end
context 'when the feature flag is enabled' do context 'when the explicit locking feature flag is enabled' do
before do before do
stub_feature_flags(generate_iids_without_explicit_locking: true) stub_feature_flags(generate_iids_without_explicit_locking: true)
end end
context 'when the insert all feature flag is enabled' do
before do
stub_feature_flags(use_insert_all_in_internal_id: true)
end
it_behaves_like 'a monotonically increasing id generator'
end
context 'when the insert all feature flag is disabled' do
before do
stub_feature_flags(use_insert_all_in_internal_id: false)
end
it_behaves_like 'a monotonically increasing id generator' it_behaves_like 'a monotonically increasing id generator'
end end
end
describe '#increment_and_save!' do describe '#increment_and_save!' do
let(:id) { create(:internal_id) } let(:id) { create(:internal_id) }
......
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