Fix to isolate the sidekiq process that runs the scheduler job (#15314)

pull/13043/head
Takeshi Umeda 2020-12-15 11:04:03 +09:00 committed by GitHub
parent 9342705e6b
commit a2ef002214
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions

View File

@ -110,6 +110,7 @@ worker.sidekiq:
mailers: bundle exec sidekiq -c 5 -q mailers -L /app/log/sidekiq.log mailers: bundle exec sidekiq -c 5 -q mailers -L /app/log/sidekiq.log
pull: bundle exec sidekiq -c 5 -q pull -L /app/log/sidekiq.log pull: bundle exec sidekiq -c 5 -q pull -L /app/log/sidekiq.log
push: bundle exec sidekiq -c 5 -q push -L /app/log/sidekiq.log push: bundle exec sidekiq -c 5 -q push -L /app/log/sidekiq.log
scheduler: bundle exec sidekiq -c 5 -q scheduler -L /app/log/sidekiq.log
writable_dirs: writable_dirs:
- tmp - tmp

View File

@ -5,37 +5,51 @@
- [push, 4] - [push, 4]
- [mailers, 2] - [mailers, 2]
- [pull] - [pull]
- [scheduler]
:scheduler:
:listened_queues_only: true
:schedule: :schedule:
scheduled_statuses_scheduler: scheduled_statuses_scheduler:
every: '5m' every: '5m'
class: Scheduler::ScheduledStatusesScheduler class: Scheduler::ScheduledStatusesScheduler
queue: scheduler
trending_tags_scheduler: trending_tags_scheduler:
every: '5m' every: '5m'
class: Scheduler::TrendingTagsScheduler class: Scheduler::TrendingTagsScheduler
queue: scheduler
media_cleanup_scheduler: media_cleanup_scheduler:
cron: '<%= Random.rand(0..59) %> <%= Random.rand(3..5) %> * * *' cron: '<%= Random.rand(0..59) %> <%= Random.rand(3..5) %> * * *'
class: Scheduler::MediaCleanupScheduler class: Scheduler::MediaCleanupScheduler
queue: scheduler
feed_cleanup_scheduler: feed_cleanup_scheduler:
cron: '<%= Random.rand(0..59) %> <%= Random.rand(0..2) %> * * *' cron: '<%= Random.rand(0..59) %> <%= Random.rand(0..2) %> * * *'
class: Scheduler::FeedCleanupScheduler class: Scheduler::FeedCleanupScheduler
queue: scheduler
doorkeeper_cleanup_scheduler: doorkeeper_cleanup_scheduler:
cron: '<%= Random.rand(0..59) %> <%= Random.rand(0..2) %> * * 0' cron: '<%= Random.rand(0..59) %> <%= Random.rand(0..2) %> * * 0'
class: Scheduler::DoorkeeperCleanupScheduler class: Scheduler::DoorkeeperCleanupScheduler
queue: scheduler
user_cleanup_scheduler: user_cleanup_scheduler:
cron: '<%= Random.rand(0..59) %> <%= Random.rand(4..6) %> * * *' cron: '<%= Random.rand(0..59) %> <%= Random.rand(4..6) %> * * *'
class: Scheduler::UserCleanupScheduler class: Scheduler::UserCleanupScheduler
queue: scheduler
ip_cleanup_scheduler: ip_cleanup_scheduler:
cron: '<%= Random.rand(0..59) %> <%= Random.rand(3..5) %> * * *' cron: '<%= Random.rand(0..59) %> <%= Random.rand(3..5) %> * * *'
class: Scheduler::IpCleanupScheduler class: Scheduler::IpCleanupScheduler
queue: scheduler
email_scheduler: email_scheduler:
cron: '0 10 * * 2' cron: '0 10 * * 2'
class: Scheduler::EmailScheduler class: Scheduler::EmailScheduler
queue: scheduler
backup_cleanup_scheduler: backup_cleanup_scheduler:
cron: '<%= Random.rand(0..59) %> <%= Random.rand(3..5) %> * * *' cron: '<%= Random.rand(0..59) %> <%= Random.rand(3..5) %> * * *'
class: Scheduler::BackupCleanupScheduler class: Scheduler::BackupCleanupScheduler
queue: scheduler
pghero_scheduler: pghero_scheduler:
cron: '0 0 * * *' cron: '0 0 * * *'
class: Scheduler::PgheroScheduler class: Scheduler::PgheroScheduler
queue: scheduler
instance_refresh_scheduler: instance_refresh_scheduler:
cron: '0 * * * *' cron: '0 * * * *'
class: Scheduler::InstanceRefreshScheduler class: Scheduler::InstanceRefreshScheduler
queue: scheduler