1 files changed, 14 insertions, 2 deletions
diff --git a/lib/gitlab/github_import/label_finder.rb b/lib/gitlab/github_import/label_finder.rb
index 39e669dbba4..d0bbd2bc7cf 100644
--- a/lib/gitlab/github_import/label_finder.rb
+++ b/lib/gitlab/github_import/label_finder.rb
@@ -7,6 +7,7 @@ module Gitlab
 
       # The base cache key to use for storing/retrieving label IDs.
       CACHE_KEY = 'github-import/label-finder/%{project}/%{name}'
+      CACHE_OBJECT_NOT_FOUND = -1
 
       # project - An instance of `Project`.
       def initialize(project)
@@ -15,7 +16,18 @@ module Gitlab
 
       # Returns the label ID for the given name.
       def id_for(name)
-        Gitlab::Cache::Import::Caching.read_integer(cache_key_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?
+
+        object_id = project.labels.with_title(name).pick(:id) || CACHE_OBJECT_NOT_FOUND
+
+        Gitlab::Cache::Import::Caching.write(cache_key, object_id)
+        object_id == CACHE_OBJECT_NOT_FOUND ? nil : object_id
       end
 
       # rubocop: disable CodeReuse/ActiveRecord
@@ -32,7 +44,7 @@ module Gitlab
       # rubocop: enable CodeReuse/ActiveRecord
 
       def cache_key_for(name)
-        CACHE_KEY % { project: project.id, name: name }
+        format(CACHE_KEY, project: project.id, name: name)
       end
     end
   end