Remove FF to make registry table SSOT for uploads

The feature flag has been enabled by default
and will be removed and is working as expected.

ee/app/models/geo/upload_registry.rb

@@ -14,10 +14,6 @@ class Geo::UploadRegistry < Geo::BaseRegistry
   scope :fresh, -> { order(created_at: :desc) }
   scope :never, -> { where(success: false, retry_count: nil) }
 
-  def self.registry_consistency_worker_enabled?
-    Feature.enabled?(:geo_file_registry_ssot_sync, default_enabled: true)
-  end
-
   def self.finder_class
     ::Geo::AttachmentRegistryFinder
   end

ee/app/workers/geo/file_download_dispatch_worker/attachment_job_finder.rb

@@ -10,13 +10,9 @@ module Geo
       end
 
       def find_unsynced_jobs(batch_size:)
-        if Geo::UploadRegistry.registry_consistency_worker_enabled?
-          convert_registry_relation_to_job_args(
-            registry_finder.find_never_synced_registries(find_batch_params(batch_size))
-          )
-        else
-          super
-        end
+        convert_registry_relation_to_job_args(
+          registry_finder.find_never_synced_registries(find_batch_params(batch_size))
+        )
       end
 
       private

ee/spec/models/geo_node_status_spec.rb

@@ -125,7 +125,7 @@ RSpec.describe GeoNodeStatus, :geo, :geo_fdw do
   describe '#attachments_synced_count' do
     it 'only counts successful syncs' do
       create_list(:user, 3, avatar: fixture_file_upload('spec/fixtures/dk.png', 'image/png'))
-      uploads = Upload.all.pluck(:id)
+      uploads = Upload.pluck(:id)
 
       create(:geo_upload_registry, :avatar, file_id: uploads[0])
       create(:geo_upload_registry, :avatar, file_id: uploads[1])
@@ -133,42 +133,12 @@ RSpec.describe GeoNodeStatus, :geo, :geo_fdw do
 
       expect(subject.attachments_synced_count).to eq(2)
     end
-
-    it 'does not count synced files that were replaced' do
-      user = create(:user, avatar: fixture_file_upload('spec/fixtures/dk.png', 'image/png'))
-
-      expect(subject.attachments_count).to eq(1)
-      expect(subject.attachments_synced_count).to eq(0)
-
-      upload = Upload.find_by(model: user, uploader: 'AvatarUploader')
-      create(:geo_upload_registry, :avatar, file_id: upload.id)
-
-      subject = described_class.current_node_status
-
-      expect(subject.attachments_count).to eq(1)
-      expect(subject.attachments_synced_count).to eq(1)
-
-      user.update(avatar: fixture_file_upload('spec/fixtures/rails_sample.jpg', 'image/jpeg'))
-
-      subject = described_class.current_node_status
-
-      expect(subject.attachments_count).to eq(1)
-      expect(subject.attachments_synced_count).to eq(0)
-
-      upload = Upload.find_by(model: user, uploader: 'AvatarUploader')
-      create(:geo_upload_registry, :avatar, file_id: upload.id)
-
-      subject = described_class.current_node_status
-
-      expect(subject.attachments_count).to eq(1)
-      expect(subject.attachments_synced_count).to eq(1)
-    end
   end
 
   describe '#attachments_synced_missing_on_primary_count' do
     it 'only counts successful syncs' do
       create_list(:user, 3, avatar: fixture_file_upload('spec/fixtures/dk.png', 'image/png'))
-      uploads = Upload.all.pluck(:id)
+      uploads = Upload.pluck(:id)
 
       create(:geo_upload_registry, :avatar, file_id: uploads[0], missing_on_primary: true)
       create(:geo_upload_registry, :avatar, file_id: uploads[1])
@@ -194,32 +164,20 @@ RSpec.describe GeoNodeStatus, :geo, :geo_fdw do
   end
 
   describe '#attachments_synced_in_percentage' do
-    let(:avatar) { fixture_file_upload('spec/fixtures/dk.png') }
-    let(:upload_1) { create(:upload, model: group, path: avatar) }
-    let(:upload_2) { create(:upload, model: project_1, path: avatar) }
-
-    before do
-      create(:upload, model: create(:group), path: avatar)
-      create(:upload, model: project_3, path: avatar)
-    end
-
-    it 'returns 0 when no objects are available' do
+    it 'returns 0 when no registries are available' do
       expect(subject.attachments_synced_in_percentage).to eq(0)
     end
 
-    it 'returns the right percentage with no group restrictions' do
-      create(:geo_upload_registry, :avatar, file_id: upload_1.id)
-      create(:geo_upload_registry, :avatar, file_id: upload_2.id)
-
-      expect(subject.attachments_synced_in_percentage).to be_within(0.0001).of(50)
-    end
+    it 'returns the right percentage' do
+      create_list(:user, 4, avatar: fixture_file_upload('spec/fixtures/dk.png', 'image/png'))
+      uploads = Upload.pluck(:id)
 
-    it 'returns the right percentage with group restrictions' do
-      secondary.update!(selective_sync_type: 'namespaces', namespaces: [group])
-      create(:geo_upload_registry, :avatar, file_id: upload_1.id)
-      create(:geo_upload_registry, :avatar, file_id: upload_2.id)
+      create(:geo_upload_registry, :avatar, file_id: uploads[0])
+      create(:geo_upload_registry, :avatar, file_id: uploads[1])
+      create(:geo_upload_registry, :avatar, :failed, file_id: uploads[2])
+      create(:geo_upload_registry, :avatar, :never_synced, file_id: uploads[3])
 
-      expect(subject.attachments_synced_in_percentage).to be_within(0.0001).of(100)
+      expect(subject.attachments_synced_in_percentage).to be_within(0.0001).of(50)
     end
   end
 

ee/spec/workers/geo/secondary/registry_consistency_worker_spec.rb

@@ -97,27 +97,6 @@ RSpec.describe Geo::Secondary::RegistryConsistencyWorker, :geo, :geo_fdw do
       expect(Geo::PackageFileRegistry.where(package_file_id: package_file.id).count).to eq(1)
     end
 
-    context 'when geo_file_registry_ssot_sync is disabled' do
-      before do
-        stub_feature_flags(geo_file_registry_ssot_sync: false)
-      end
-
-      it 'returns false' do
-        expect(subject.perform).to be_falsey
-      end
-
-      it 'does not execute RegistryConsistencyService for Uploads' do
-        allow(Geo::RegistryConsistencyService).to receive(:new).with(Geo::JobArtifactRegistry, batch_size: 1000).and_call_original
-        allow(Geo::RegistryConsistencyService).to receive(:new).with(Geo::LfsObjectRegistry, batch_size: 1000).and_call_original
-        allow(Geo::RegistryConsistencyService).to receive(:new).with(Geo::PackageFileRegistry, batch_size: 1000).and_call_original
-        allow(Geo::RegistryConsistencyService).to receive(:new).with(Geo::ProjectRegistry, batch_size: 1000).and_call_original
-
-        expect(Geo::RegistryConsistencyService).not_to receive(:new).with(Geo::UploadRegistry, batch_size: 1000)
-
-        subject.perform
-      end
-    end
-
     context 'when geo_project_registry_ssot_sync is disabled' do
       before do
         stub_feature_flags(geo_project_registry_ssot_sync: false)