1 files changed, 8 insertions, 33 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index da38c11ebca..6dee9a404f4 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -283,6 +283,7 @@ module Gitlab
     def self.execute(storage, service, rpc, request, remote_storage:, timeout:)
       enforce_gitaly_request_limits(:call)
       Gitlab::RequestContext.instance.ensure_deadline_not_exceeded!
+      raise_if_concurrent_ruby!
 
       kwargs = request_kwargs(storage, timeout: timeout.to_f, remote_storage: remote_storage)
       kwargs = yield(kwargs) if block_given?
@@ -547,43 +548,10 @@ module Gitlab
       end
     end
 
-    def self.storage_metadata_file_path(storage)
-      Gitlab::GitalyClient::StorageSettings.allow_disk_access do
-        File.join(
-          Gitlab.config.repositories.storages[storage].legacy_disk_path, GITALY_METADATA_FILENAME
-        )
-      end
-    end
-
-    def self.can_use_disk?(storage)
-      cached_value = MUTEX.synchronize do
-        @can_use_disk ||= {}
-        @can_use_disk[storage]
-      end
-
-      return cached_value unless cached_value.nil?
-
-      gitaly_filesystem_id = filesystem_id(storage)
-      direct_filesystem_id = filesystem_id_from_disk(storage)
-
-      MUTEX.synchronize do
-        @can_use_disk[storage] = gitaly_filesystem_id.present? &&
-          gitaly_filesystem_id == direct_filesystem_id
-      end
-    end
-
     def self.filesystem_id(storage)
       Gitlab::GitalyClient::ServerService.new(storage).storage_info&.filesystem_id
     end
 
-    def self.filesystem_id_from_disk(storage)
-      metadata_file = File.read(storage_metadata_file_path(storage))
-      metadata_hash = Gitlab::Json.parse(metadata_file)
-      metadata_hash['gitaly_filesystem_id']
-    rescue Errno::ENOENT, Errno::EACCES, JSON::ParserError
-      nil
-    end
-
     def self.filesystem_disk_available(storage)
       Gitlab::GitalyClient::ServerService.new(storage).storage_disk_statistics&.available
     end
@@ -669,5 +637,12 @@ module Gitlab
         Thread.current[:gitaly_feature_flag_actors] ||= {}
       end
     end
+
+    def self.raise_if_concurrent_ruby!
+      Gitlab::Utils.raise_if_concurrent_ruby!(:gitaly)
+    rescue StandardError => e
+      Gitlab::ErrorTracking.track_and_raise_for_dev_exception(e)
+    end
+    private_class_method :raise_if_concurrent_ruby!
   end
 end