Commit a6a1b731 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch '44582-clear-pipeline-status-cache' into 'master'

Allow `rake cache:clear` clearing pipeline status cache

Closes #44582

See merge request gitlab-org/gitlab-ce!18257
parents ef3fb77f 4b30aec0
---
title: Now `rake cache:clear` will also clear pipeline status cache
merge_request: 18257
author:
type: fixed
...@@ -40,7 +40,7 @@ module Gitlab ...@@ -40,7 +40,7 @@ module Gitlab
end end
def self.cache_key_for_project(project) def self.cache_key_for_project(project)
"projects/#{project.id}/pipeline_status" "#{Gitlab::Redis::Cache::CACHE_NAMESPACE}:projects/#{project.id}/pipeline_status"
end end
def self.update_for_pipeline(pipeline) def self.update_for_pipeline(pipeline)
......
...@@ -6,11 +6,15 @@ namespace :cache do ...@@ -6,11 +6,15 @@ namespace :cache do
desc "GitLab | Clear redis cache" desc "GitLab | Clear redis cache"
task redis: :environment do task redis: :environment do
Gitlab::Redis::Cache.with do |redis| Gitlab::Redis::Cache.with do |redis|
cache_key_pattern = %W[#{Gitlab::Redis::Cache::CACHE_NAMESPACE}*
projects/*/pipeline_status]
cache_key_pattern.each do |match|
cursor = REDIS_SCAN_START_STOP cursor = REDIS_SCAN_START_STOP
loop do loop do
cursor, keys = redis.scan( cursor, keys = redis.scan(
cursor, cursor,
match: "#{Gitlab::Redis::Cache::CACHE_NAMESPACE}*", match: match,
count: REDIS_CLEAR_BATCH_SIZE count: REDIS_CLEAR_BATCH_SIZE
) )
...@@ -20,6 +24,7 @@ namespace :cache do ...@@ -20,6 +24,7 @@ namespace :cache do
end end
end end
end end
end
task all: [:redis] task all: [:redis]
end end
......
...@@ -3,7 +3,7 @@ require 'spec_helper' ...@@ -3,7 +3,7 @@ require 'spec_helper'
describe Gitlab::Cache::Ci::ProjectPipelineStatus, :clean_gitlab_redis_cache do describe Gitlab::Cache::Ci::ProjectPipelineStatus, :clean_gitlab_redis_cache do
let!(:project) { create(:project, :repository) } let!(:project) { create(:project, :repository) }
let(:pipeline_status) { described_class.new(project) } let(:pipeline_status) { described_class.new(project) }
let(:cache_key) { "projects/#{project.id}/pipeline_status" } let(:cache_key) { described_class.cache_key_for_project(project) }
describe '.load_for_project' do describe '.load_for_project' do
it "loads the status" do it "loads the status" do
......
require 'rake_helper'
describe 'clearing redis cache' do
before do
Rake.application.rake_require 'tasks/cache'
end
describe 'clearing pipeline status cache' do
let(:pipeline_status) { create(:ci_pipeline).project.pipeline_status }
before do
allow(pipeline_status).to receive(:loaded).and_return(nil)
end
it 'clears pipeline status cache' do
expect { run_rake_task('cache:clear:redis') }.to change { pipeline_status.has_cache? }
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment