github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-03 05:39:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

PERF: Use Redis SET EX GET instead of LUA script for counting (#15939)

Browse Source 
This will prevent Discourse from booting on Redis < 6.2.0
This commit is contained in:
Rafael dos Santos Silva 2022-02-15 10:36:07 -03:00 committed by GitHub
parent a48231041b
commit 4d3da70bc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/models/concerns/cached_counting.rb
View File

@ -42,19 +42,10 @@ module CachedCounting
raise NotImplementedError raise NotImplementedError
end end
GET_AND_RESET = <<~LUA
local val = redis.call('get', KEYS[1])
redis.call('set', KEYS[1], '0')
return val
LUA
# this may seem a bit fancy but in so it allows # this may seem a bit fancy but in so it allows
# for concurrent calls without double counting # for concurrent calls without double counting
def get_and_reset(key) def get_and_reset(key)
namespaced_key = Discourse.redis.namespace_key(key) Discourse.redis.set(key, '0', ex: 259200, get: true).to_i
val = Discourse.redis.without_namespace.eval(GET_AND_RESET, keys: [namespaced_key]).to_i
Discourse.redis.expire(key, 259200) # SET removes expiry, so set it again
val
end end
def request_id(query_params, retries = 0) def request_id(query_params, retries = 0)

5
config/initializers/001-redis.rb
View File

@ -8,3 +8,8 @@ end
# Pending https://github.com/MiniProfiler/rack-mini-profiler/pull/450 and # Pending https://github.com/MiniProfiler/rack-mini-profiler/pull/450 and
# upgrade to Sidekiq 6.1 # upgrade to Sidekiq 6.1
Redis.exists_returns_integer = true Redis.exists_returns_integer = true
if Gem::Version.new(Discourse.redis.info['redis_version']) < Gem::Version.new("6.2.0")
STDERR.puts "Discourse requires Redis 6.2.0 or up"
exit 1
end

4
spec/models/application_request_spec.rb
View File

@ -30,14 +30,14 @@ describe ApplicationRequest do
inc(:http_total) inc(:http_total)
Discourse.redis.without_namespace.stubs(:incr).raises(Redis::CommandError.new("READONLY")) Discourse.redis.without_namespace.stubs(:incr).raises(Redis::CommandError.new("READONLY"))
Discourse.redis.without_namespace.stubs(:eval).raises(Redis::CommandError.new("READONLY")) Discourse.redis.without_namespace.stubs(:set).raises(Redis::CommandError.new("READONLY"))
# flush will be deferred no error raised # flush will be deferred no error raised
inc(:http_total, autoflush: 3) inc(:http_total, autoflush: 3)
ApplicationRequest.write_cache! ApplicationRequest.write_cache!
Discourse.redis.without_namespace.unstub(:incr) Discourse.redis.without_namespace.unstub(:incr)
Discourse.redis.without_namespace.unstub(:eval) Discourse.redis.without_namespace.unstub(:set)
inc(:http_total, autoflush: 3) inc(:http_total, autoflush: 3)
expect(ApplicationRequest.http_total.first.count).to eq(3) expect(ApplicationRequest.http_total.first.count).to eq(3)

4
spec/models/web_crawler_request_spec.rb
View File

@ -32,13 +32,13 @@ describe WebCrawlerRequest do
inc('Googlebot') inc('Googlebot')
Discourse.redis.without_namespace.stubs(:incr).raises(Redis::CommandError.new("READONLY")) Discourse.redis.without_namespace.stubs(:incr).raises(Redis::CommandError.new("READONLY"))
Discourse.redis.without_namespace.stubs(:eval).raises(Redis::CommandError.new("READONLY")) Discourse.redis.without_namespace.stubs(:set).raises(Redis::CommandError.new("READONLY"))
inc('Googlebot', autoflush: 3) inc('Googlebot', autoflush: 3)
WebCrawlerRequest.write_cache! WebCrawlerRequest.write_cache!
Discourse.redis.without_namespace.unstub(:incr) Discourse.redis.without_namespace.unstub(:incr)
Discourse.redis.without_namespace.unstub(:eval) Discourse.redis.without_namespace.unstub(:set)
inc('Googlebot', autoflush: 3) inc('Googlebot', autoflush: 3)
expect(web_crawler_request('Googlebot').count).to eq(3) expect(web_crawler_request('Googlebot').count).to eq(3)