Merge branch '20011-incosistent-branch-cache-state' into 'master'

Expire tags/branches repo cache before delete a repository ## What does this MR do? Explicitly expire tag and branch cache data before deleting a repository. Those keys don't depend on git data when they are expired ## Why was this MR needed? To solve an existing problem https://sentry.gitlap.com/gitlab/gitlabcom/issues/8756/ ## What are the relevant issue numbers? Closes #20011 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~[ ] API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5356

Merge branch '20011-incosistent-branch-cache-state' into 'master'
1ae2be23 · Rémy Coutable · ef2edcc1 · eb122e40 · 1ae2be23 · 1ae2be23
Commit 1ae2be23 authored Jul 20, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 53 additions and 0 deletions

repository.rb app/models/repository.rb +5 -0

repository_spec.rb spec/models/repository_spec.rb +48 -0

No files found.
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -392,6 +392,11 @@ class Repository

    expire_cache if exists?

+    # expire cache that don't depend on repository data (when expiring)
+    expire_tags_cache
+    expire_tag_count_cache
+    expire_branches_cache
+    expire_branch_count_cache
    expire_root_ref_cache
    expire_emptiness_caches
    expire_exists_cache

--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -749,6 +749,30 @@ describe Repository, models: true do
        repository.before_delete
      end

+      it 'flushes the tags cache' do
+        expect(repository).to receive(:expire_tags_cache)
+
+        repository.before_delete
+      end
+
+      it 'flushes the tag count cache' do
+        expect(repository).to receive(:expire_tag_count_cache)
+
+        repository.before_delete
+      end
+
+      it 'flushes the branches cache' do
+        expect(repository).to receive(:expire_branches_cache)
+
+        repository.before_delete
+      end
+
+      it 'flushes the branch count cache' do
+        expect(repository).to receive(:expire_branch_count_cache)
+
+        repository.before_delete
+      end
+
      it 'flushes the root ref cache' do
        expect(repository).to receive(:expire_root_ref_cache)

@@ -779,6 +803,30 @@ describe Repository, models: true do
        repository.before_delete
      end

+      it 'flushes the tags cache' do
+        expect(repository).to receive(:expire_tags_cache)
+
+        repository.before_delete
+      end
+
+      it 'flushes the tag count cache' do
+        expect(repository).to receive(:expire_tag_count_cache)
+
+        repository.before_delete
+      end
+
+      it 'flushes the branches cache' do
+        expect(repository).to receive(:expire_branches_cache)
+
+        repository.before_delete
+      end
+
+      it 'flushes the branch count cache' do
+        expect(repository).to receive(:expire_branch_count_cache)
+
+        repository.before_delete
+      end
+
      it 'flushes the root ref cache' do
        expect(repository).to receive(:expire_root_ref_cache)