commit: 82aaedec467815c2947a11651d5216bb88ce4038
parent: b1f3499c3806682375a0496f99b4bc908d89cd84
Author: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 4 Apr 2017 13:58:34 +0200
Reduce number of items in feeds, optimize regeneration worker slightly,
make regeneration worker unique, (only schedule/execute once at a time)
Diffstat:
5 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/Gemfile b/Gemfile
@@ -46,6 +46,8 @@ gem 'will_paginate'
gem 'rack-attack'
gem 'rack-cors', require: 'rack/cors'
gem 'sidekiq'
+gem 'sidekiq-unique-jobs'
+gem 'sidekiq-merger'
gem 'rails-settings-cached'
gem 'simple-navigation'
gem 'statsd-instrument'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -387,6 +387,13 @@ GEM
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0)
redis (~> 3.2, >= 3.2.1)
+ sidekiq-merger (0.0.11)
+ activesupport (>= 3.2, < 6)
+ concurrent-ruby (~> 1.0)
+ sidekiq (>= 3.4, < 5)
+ sidekiq-unique-jobs (4.0.18)
+ sidekiq (>= 2.6)
+ thor
simple-navigation (4.0.3)
activesupport (>= 2.3.2)
simple_form (3.2.1)
@@ -510,6 +517,8 @@ DEPENDENCIES
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
sidekiq
+ sidekiq-merger
+ sidekiq-unique-jobs
simple-navigation
simple_form
simplecov
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
@@ -5,7 +5,7 @@ require 'singleton'
class FeedManager
include Singleton
- MAX_ITEMS = 800
+ MAX_ITEMS = 400
def key(type, id)
"feed:#{type}:#{id}"
@@ -50,9 +50,9 @@ class FeedManager
def merge_into_timeline(from_account, into_account)
timeline_key = key(:home, into_account.id)
- query = from_account.statuses.limit(MAX_ITEMS)
+ query = from_account.statuses.limit(FeedManager::MAX_ITEMS / 4)
- if redis.zcard(timeline_key) >= FeedManager::MAX_ITEMS
+ if redis.zcard(timeline_key) >= FeedManager::MAX_ITEMS / 4
oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true)&.first&.last&.to_i || 0
query = query.where('id > ?', oldest_home_score)
end
diff --git a/app/services/precompute_feed_service.rb b/app/services/precompute_feed_service.rb
@@ -5,9 +5,11 @@ class PrecomputeFeedService < BaseService
# @param [Symbol] type :home or :mentions
# @param [Account] account
def call(_, account)
- Status.as_home_timeline(account).limit(FeedManager::MAX_ITEMS).each do |status|
- next if status.direct_visibility? || FeedManager.instance.filter?(:home, status, account)
- redis.zadd(FeedManager.instance.key(:home, account.id), status.id, status.reblog? ? status.reblog_of_id : status.id)
+ redis.pipelined do
+ Status.as_home_timeline(account).limit(FeedManager::MAX_ITEMS / 4).each do |status|
+ next if status.direct_visibility? || FeedManager.instance.filter?(:home, status, account)
+ redis.zadd(FeedManager.instance.key(:home, account.id), status.id, status.reblog? ? status.reblog_of_id : status.id)
+ end
end
end
diff --git a/app/workers/regeneration_worker.rb b/app/workers/regeneration_worker.rb
@@ -3,7 +3,7 @@
class RegenerationWorker
include Sidekiq::Worker
- sidekiq_options queue: 'pull', backtrace: true
+ sidekiq_options queue: 'pull', backtrace: true, unique: :until_executed
def perform(account_id, _ = :home)
PrecomputeFeedService.new.call(:home, Account.find(account_id))