mirror of
https://github.com/hibiken/asynq.git
synced 2024-12-25 07:12:17 +08:00
[performance] Use BRPOPLPUSH if one queue is used
This commit is contained in:
parent
f0251be5d2
commit
5a6f737589
@ -60,11 +60,17 @@ func (r *RDB) Enqueue(msg *base.TaskMessage) error {
|
|||||||
// is one and returns it. If all queues are empty, ErrNoProcessableTask
|
// is one and returns it. If all queues are empty, ErrNoProcessableTask
|
||||||
// error is returned.
|
// error is returned.
|
||||||
func (r *RDB) Dequeue(qnames ...string) (*base.TaskMessage, error) {
|
func (r *RDB) Dequeue(qnames ...string) (*base.TaskMessage, error) {
|
||||||
var keys []string
|
var data string
|
||||||
for _, q := range qnames {
|
var err error
|
||||||
keys = append(keys, base.QueueKey(q))
|
if len(qnames) == 1 {
|
||||||
|
data, err = r.dequeueSingle(base.QueueKey(qnames[0]))
|
||||||
|
} else {
|
||||||
|
var keys []string
|
||||||
|
for _, q := range qnames {
|
||||||
|
keys = append(keys, base.QueueKey(q))
|
||||||
|
}
|
||||||
|
data, err = r.dequeue(keys...)
|
||||||
}
|
}
|
||||||
data, err := r.dequeue(keys...)
|
|
||||||
if err == redis.Nil {
|
if err == redis.Nil {
|
||||||
return nil, ErrNoProcessableTask
|
return nil, ErrNoProcessableTask
|
||||||
}
|
}
|
||||||
@ -79,6 +85,11 @@ func (r *RDB) Dequeue(qnames ...string) (*base.TaskMessage, error) {
|
|||||||
return &msg, nil
|
return &msg, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *RDB) dequeueSingle(queue string) (data string, err error) {
|
||||||
|
// timeout needed to avoid blocking forever
|
||||||
|
return r.client.BRPopLPush(queue, base.InProgressQueue, time.Second).Result()
|
||||||
|
}
|
||||||
|
|
||||||
func (r *RDB) dequeue(queues ...string) (data string, err error) {
|
func (r *RDB) dequeue(queues ...string) (data string, err error) {
|
||||||
var args []interface{}
|
var args []interface{}
|
||||||
for _, qkey := range queues {
|
for _, qkey := range queues {
|
||||||
|
15
processor.go
15
processor.go
@ -124,8 +124,12 @@ func (p *processor) exec() {
|
|||||||
msg, err := p.rdb.Dequeue(qnames...)
|
msg, err := p.rdb.Dequeue(qnames...)
|
||||||
if err == rdb.ErrNoProcessableTask {
|
if err == rdb.ErrNoProcessableTask {
|
||||||
// queues are empty, this is a normal behavior.
|
// queues are empty, this is a normal behavior.
|
||||||
// sleep to avoid slamming redis and let scheduler move tasks into queues.
|
if len(p.queueConfig) > 1 {
|
||||||
time.Sleep(time.Second)
|
// sleep to avoid slamming redis and let scheduler move tasks into queues.
|
||||||
|
// Note: With multiple queues, we are not using blocking pop operation and
|
||||||
|
// polling queues instead. This adds significant load to redis.
|
||||||
|
time.Sleep(time.Second)
|
||||||
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -221,6 +225,13 @@ func (p *processor) kill(msg *base.TaskMessage, e error) {
|
|||||||
// If strict-priority is false, then the order of queue names are roughly based on
|
// If strict-priority is false, then the order of queue names are roughly based on
|
||||||
// the priority level but randomized in order to avoid starving low priority queues.
|
// the priority level but randomized in order to avoid starving low priority queues.
|
||||||
func (p *processor) queues() []string {
|
func (p *processor) queues() []string {
|
||||||
|
// skip the overhead of generating a list of queue names
|
||||||
|
// if we are processing one queue.
|
||||||
|
if len(p.queueConfig) == 1 {
|
||||||
|
for qname := range p.queueConfig {
|
||||||
|
return []string{qname}
|
||||||
|
}
|
||||||
|
}
|
||||||
if p.orderedQueues != nil {
|
if p.orderedQueues != nil {
|
||||||
return p.orderedQueues
|
return p.orderedQueues
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user