Verified Commit 28351120 authored by Stan Hu's avatar Stan Hu Committed by James Lopez
Browse files

Merge branch 'mk/geo/fix-noise-when-wiki-is-disabled' into 'master' 

Prevent unnecessary, excessive updates

Closes #5432

See merge request gitlab-org/gitlab-ee!5119
parent 88db0653

ee/app/workers/geo/project_sync_worker.rb

+4 −3
Original line number Diff line number Diff line
@@ -33,14 +33,15 @@ def mark_disabled_wiki_as_synced(registry) 
      return if registry.project.wiki_enabled?



      registry.last_wiki_sync_failure = nil

      registry.last_wiki_synced_at = DateTime.now

      registry.last_wiki_successful_sync_at = DateTime.now

      registry.resync_wiki = false

      registry.wiki_retry_count = nil

      registry.wiki_retry_at = nil

      registry.force_to_redownload_wiki = false



      if registry.changed?

      if registry.changed? || registry.last_wiki_synced_at.nil? || registry.last_wiki_successful_sync_at.nil?

        registry.last_wiki_synced_at = DateTime.now

        registry.last_wiki_successful_sync_at = DateTime.now



        success = registry.save

        log_info("#{success ? 'Successfully marked' : 'Failed to mark'} disabled wiki as synced", registry_id: registry.id, project_id: registry.project_id)

      end

ee/changelogs/unreleased/mk-geo-fix-noise-when-wiki-is-disabled.yml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
---

title: Fix excessive updates to file_registry when wiki is disabled

merge_request: 5119

author:

type: fixed