Skip to content
Snippets Groups Projects
Commit f7f4979f authored by Piotr Skorupa's avatar Piotr Skorupa
Browse files

Merge branch '428700-remove-import-fallback-to-db-empty-cache' into 'master'

Removing FF fallback_to_db to ensure we recache ids on cache miss

See merge request !136931



Merged-by: default avatarPiotr Skorupa <pskorupa@gitlab.com>
Approved-by: Alex Buijs's avatarAlex Buijs <abuijs@gitlab.com>
Approved-by: default avatarPiotr Skorupa <pskorupa@gitlab.com>
Co-authored-by: default avatarMax Fan <mfan@gitlab.com>
parents 094a3c9f 72aa2785
No related branches found
No related tags found
1 merge request!136931Removing FF fallback_to_db to ensure we recache ids on cache miss
Pipeline #1075697260 passed with warnings
---
name: import_fallback_to_db_empty_cache
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133914
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/428700
milestone: '16.6'
type: development
group: group::import and integrate
default_enabled: false
......@@ -26,8 +26,6 @@ def initialize(project, object)
def database_id
val = Gitlab::Cache::Import::Caching.read_integer(cache_key, timeout: timeout)
return val if Feature.disabled?(:import_fallback_to_db_empty_cache, project)
return if val == CACHE_OBJECT_NOT_FOUND
return val if val.present?
......
......@@ -19,8 +19,6 @@ def id_for(name)
cache_key = cache_key_for(name)
val = Gitlab::Cache::Import::Caching.read_integer(cache_key)
return val if Feature.disabled?(:import_fallback_to_db_empty_cache, project)
return if val == CACHE_OBJECT_NOT_FOUND
return val if val.present?
......
......@@ -24,8 +24,6 @@ def id_for(issuable)
val = Gitlab::Cache::Import::Caching.read_integer(cache_key)
return val if Feature.disabled?(:import_fallback_to_db_empty_cache, project)
return if val == CACHE_OBJECT_NOT_FOUND
return val if val.present?
......
......@@ -48,34 +48,6 @@
expect { finder.database_id }.to raise_error(TypeError)
end
context 'with FF import_fallback_to_db_empty_cache disabled' do
before do
stub_feature_flags(import_fallback_to_db_empty_cache: false)
end
it 'returns nil if object does not exist' do
missing_issue = double(:issue, issuable_type: 'MergeRequest', issuable_id: 999)
expect(described_class.new(project, missing_issue).database_id).to be_nil
end
it 'does not fetch object id from database if not in cache' do
expect(finder.database_id).to eq(nil)
end
it 'fetches object id from cache if present' do
finder.cache_database_id(10)
expect(finder.database_id).to eq(10)
end
it 'returns -1 if cache is -1' do
finder.cache_database_id(-1)
expect(finder.database_id).to eq(-1)
end
end
context 'when group is present' do
context 'when settings single_endpoint_notes_import is enabled' do
let(:single_endpoint_optional_stage) { true }
......
......@@ -49,34 +49,6 @@
expect(finder.id_for(feature.name)).to eq(feature.id)
end
end
context 'with FF import_fallback_to_db_empty_cache disabled' do
before do
stub_feature_flags(import_fallback_to_db_empty_cache: false)
end
it 'returns nil for a non existing label name' do
expect(finder.id_for('kittens')).to be_nil
end
it 'does not fetch object id from database if not in cache' do
expect(finder.id_for(feature.name)).to be_nil
end
it 'fetches object id from cache if present' do
finder.build_cache
expect(finder.id_for(feature.name)).to eq(feature.id)
end
it 'returns -1 if cache is -1' do
key = finder.cache_key_for(bug.name)
Gitlab::Cache::Import::Caching.write(key, -1)
expect(finder.id_for(bug.name)).to eq(-1)
end
end
end
describe '#build_cache' do
......
......@@ -57,36 +57,6 @@
expect(finder.id_for(issuable)).to eq(milestone.id)
end
end
context 'with FF import_fallback_to_db_empty_cache disabled' do
before do
stub_feature_flags(import_fallback_to_db_empty_cache: false)
end
it 'returns nil if object does not exist' do
missing_issuable = double(:issuable, milestone_number: 999)
expect(finder.id_for(missing_issuable)).to be_nil
end
it 'does not fetch object id from database if not in cache' do
expect(finder.id_for(issuable)).to be_nil
end
it 'fetches object id from cache if present' do
finder.build_cache
expect(finder.id_for(issuable)).to eq(milestone.id)
end
it 'returns -1 if cache is -1' do
key = finder.cache_key_for(milestone.iid)
Gitlab::Cache::Import::Caching.write(key, -1)
expect(finder.id_for(issuable)).to eq(-1)
end
end
end
describe '#build_cache' do
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment