mirror of
https://github.com/hibiken/asynq.git
synced 2024-11-14 11:31:18 +08:00
Remove per task heartbeat
This commit is contained in:
parent
2e0af11ca0
commit
3fa867b190
19
processor.go
19
processor.go
@ -81,31 +81,12 @@ func (p *processor) exec() {
|
|||||||
task := &Task{Type: msg.Type, Payload: msg.Payload}
|
task := &Task{Type: msg.Type, Payload: msg.Payload}
|
||||||
p.sema <- struct{}{} // acquire token
|
p.sema <- struct{}{} // acquire token
|
||||||
go func(task *Task) {
|
go func(task *Task) {
|
||||||
quit := make(chan struct{}) // channel to signal heartbeat goroutine
|
|
||||||
defer func() {
|
defer func() {
|
||||||
quit <- struct{}{}
|
|
||||||
if err := p.rdb.srem(inProgress, msg); err != nil {
|
if err := p.rdb.srem(inProgress, msg); err != nil {
|
||||||
log.Printf("[SERVER ERROR] SREM failed: %v\n", err)
|
log.Printf("[SERVER ERROR] SREM failed: %v\n", err)
|
||||||
}
|
}
|
||||||
if err := p.rdb.clearHeartbeat(msg.ID); err != nil {
|
|
||||||
log.Printf("[SERVER ERROR] DEL heartbeat failed: %v\n", err)
|
|
||||||
}
|
|
||||||
<-p.sema // release token
|
<-p.sema // release token
|
||||||
}()
|
}()
|
||||||
// start "heartbeat" goroutine
|
|
||||||
go func() {
|
|
||||||
ticker := time.NewTicker(5 * time.Second)
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case <-quit:
|
|
||||||
return
|
|
||||||
case t := <-ticker.C:
|
|
||||||
if err := p.rdb.heartbeat(msg.ID, t); err != nil {
|
|
||||||
log.Printf("[ERROR] heartbeat failed for %v at %v: %v", msg.ID, t, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
err := p.handler(task) // TODO(hibiken): maybe also handle panic?
|
err := p.handler(task) // TODO(hibiken): maybe also handle panic?
|
||||||
if err != nil {
|
if err != nil {
|
||||||
retryTask(p.rdb, msg, err)
|
retryTask(p.rdb, msg, err)
|
||||||
|
19
rdb.go
19
rdb.go
@ -9,7 +9,6 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/go-redis/redis/v7"
|
"github.com/go-redis/redis/v7"
|
||||||
"github.com/google/uuid"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Redis keys
|
// Redis keys
|
||||||
@ -147,24 +146,6 @@ func (r *rdb) move(from string, msg *taskMessage) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *rdb) heartbeat(id uuid.UUID, timestamp time.Time) error {
|
|
||||||
key := heartbeatPrefix + id.String()
|
|
||||||
err := r.client.Set(key, timestamp, 0).Err() // zero expiration means no expiration
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("command SET %s %v failed: %v", key, timestamp, err)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *rdb) clearHeartbeat(id uuid.UUID) error {
|
|
||||||
key := heartbeatPrefix + id.String()
|
|
||||||
err := r.client.Del(key).Err()
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("command DEL %s failed: %v", key, err)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
const maxDeadTask = 100
|
const maxDeadTask = 100
|
||||||
const deadExpirationInDays = 90
|
const deadExpirationInDays = 90
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user