Merge branch 'dev' of github.com:yuninks/timerx into dev
This commit is contained in:
Yun
+9
-118
@@ -6,7 +6,6 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"runtime/debug"
|
||||
"strconv"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
@@ -15,6 +14,7 @@ import (
|
||||
"github.com/yuninks/cachex"
|
||||
"github.com/yuninks/lockx"
|
||||
"github.com/yuninks/timerx/logger"
|
||||
"github.com/yuninks/timerx/priority"
|
||||
)
|
||||
|
||||
// 功能描述
|
||||
@@ -44,8 +44,8 @@ type Cluster struct {
|
||||
listKey string // 可执行的任务列表的key
|
||||
setKey string // 重入集合的key
|
||||
|
||||
priority int // 全局优先级
|
||||
priorityKey string // 全局优先级的key
|
||||
priority *priority.Priority // 全局优先级
|
||||
priorityKey string // 全局优先级的key
|
||||
}
|
||||
|
||||
// var clu *Cluster = nil
|
||||
@@ -65,7 +65,6 @@ func InitCluster(ctx context.Context, red redis.UniversalClient, keyPrefix strin
|
||||
logger: op.logger,
|
||||
keyPrefix: keyPrefix,
|
||||
location: op.location,
|
||||
priority: op.priority,
|
||||
lockKey: "timer:cluster_globalLockKey" + keyPrefix, // 定时器的全局锁
|
||||
zsetKey: "timer:cluster_zsetKey" + keyPrefix, // 有序集合
|
||||
listKey: "timer:cluster_listKey" + keyPrefix, // 列表
|
||||
@@ -73,26 +72,12 @@ func InitCluster(ctx context.Context, red redis.UniversalClient, keyPrefix strin
|
||||
priorityKey: "timer:cluster_priorityKey" + keyPrefix, // 全局优先级的key
|
||||
}
|
||||
|
||||
// 设置锁的超时时间
|
||||
lockx.InitOption(lockx.SetTimeout(op.timeout))
|
||||
// 初始化优先级
|
||||
clu.priority = priority.InitPriority(ctx, red, clu.priorityKey, op.priority, priority.SetLogger(clu.logger))
|
||||
|
||||
// 监听任务
|
||||
go clu.watch()
|
||||
|
||||
priorityTime := time.NewTicker(time.Second * 10)
|
||||
go func(ctx context.Context) {
|
||||
clu.setPriority()
|
||||
Loop:
|
||||
for {
|
||||
select {
|
||||
case <-priorityTime.C:
|
||||
clu.setPriority()
|
||||
case <-ctx.Done():
|
||||
break Loop
|
||||
}
|
||||
}
|
||||
}(ctx)
|
||||
|
||||
timer := time.NewTicker(time.Millisecond * 200)
|
||||
|
||||
go func(ctx context.Context) {
|
||||
@@ -100,7 +85,7 @@ func InitCluster(ctx context.Context, red redis.UniversalClient, keyPrefix strin
|
||||
for {
|
||||
select {
|
||||
case <-timer.C:
|
||||
if !clu.canRun() {
|
||||
if !clu.priority.IsLatest(ctx) {
|
||||
continue
|
||||
}
|
||||
clu.getTask()
|
||||
@@ -110,104 +95,10 @@ func InitCluster(ctx context.Context, red redis.UniversalClient, keyPrefix strin
|
||||
}
|
||||
}
|
||||
}(ctx)
|
||||
// })
|
||||
|
||||
return clu
|
||||
}
|
||||
|
||||
// 判断是否可执行
|
||||
func (l *Cluster) canRun() bool {
|
||||
// 加缓存
|
||||
str, err := l.redis.Get(l.ctx, l.priorityKey).Result()
|
||||
|
||||
fmt.Println(str, err)
|
||||
|
||||
if err != nil {
|
||||
if err == redis.Nil && l.priority == 0 {
|
||||
return true
|
||||
}
|
||||
l.logger.Errorf(l.ctx, "获取全局优先级失败:%s", err.Error())
|
||||
return false
|
||||
}
|
||||
|
||||
strPriority, err := strconv.Atoi(str)
|
||||
if err != nil {
|
||||
l.logger.Errorf(l.ctx, "全局优先级转换失败:%s", err.Error())
|
||||
return false
|
||||
}
|
||||
if l.priority >= strPriority {
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// 设置全局优先级
|
||||
func (l *Cluster) setPriority() bool {
|
||||
// redis lua脚本
|
||||
// 如果redis的可以不存在则设置值，如果存在且redis内的值比当前大则不处理，如果存在redis内的值比当前小或等于则更新值且更新ttl
|
||||
script := `
|
||||
-- KEYS[1] 是全局优先级的key
|
||||
local priorityKey = KEYS[1]
|
||||
-- ARGV[1] 是新的优先级
|
||||
local priority = ARGV[1]
|
||||
-- ARGV[2] 是过期时间
|
||||
local expireTime = ARGV[2]
|
||||
|
||||
-- 校验参数完整性
|
||||
if not priorityKey or not priority or not expireTime then
|
||||
return redis.error_reply("Missing required arguments")
|
||||
end
|
||||
|
||||
-- 尝试将字符串转换为数字
|
||||
local currentPriority = redis.call('get', priorityKey)
|
||||
local currentPriorityNum = tonumber(currentPriority)
|
||||
local newPriorityNum = tonumber(priority)
|
||||
|
||||
if not currentPriority then
|
||||
-- 如果当前优先级不存在，则设置新优先级并设置TTL
|
||||
redis.call('set', priorityKey, priority, 'ex', expireTime)
|
||||
return { "SET", expireTime }
|
||||
elseif currentPriorityNum < newPriorityNum then
|
||||
-- 如果当前优先级小于新优先级，则更新优先级并更新TTL
|
||||
redis.call('set', priorityKey, priority, 'ex', expireTime)
|
||||
return { "RESET", expireTime }
|
||||
elseif currentPriorityNum == newPriorityNum then
|
||||
-- 优先级相同则更新TTL
|
||||
redis.call('expire', priorityKey, expireTime)
|
||||
return { "UPDATE", expireTime }
|
||||
else
|
||||
-- 如果当前优先级大于新优先级，则不更新
|
||||
return { "NOAUCH", '0' }
|
||||
end
|
||||
`
|
||||
priority := fmt.Sprintf("%d", l.priority)
|
||||
|
||||
expireTime := (time.Second * 30).Seconds() // 设置过期时间为1分钟
|
||||
res, err := l.redis.Eval(l.ctx, script, []string{l.priorityKey}, priority, expireTime).Result()
|
||||
if err != nil {
|
||||
l.logger.Errorf(l.ctx, "设置全局优先级失败:%s", err.Error())
|
||||
return false
|
||||
}
|
||||
|
||||
fmt.Printf("设置全局优先级返回值:%+v", res)
|
||||
|
||||
// 处理返回值，包含操作结果和 TTL
|
||||
resultArray := res.([]interface{})
|
||||
if len(resultArray) < 2 {
|
||||
l.logger.Errorf(l.ctx, "设置全局优先级失败: 返回值格式不正确")
|
||||
return false
|
||||
}
|
||||
operationResult := resultArray[0].(string)
|
||||
ttl := resultArray[1].(string)
|
||||
|
||||
if operationResult == "SET" || operationResult == "UPDATE" {
|
||||
l.logger.Infof(l.ctx, "设置全局优先级成功:%s", priority)
|
||||
return true
|
||||
}
|
||||
_ = ttl
|
||||
l.logger.Infof(l.ctx, "设置全局优先级未更新:%s", priority)
|
||||
return false
|
||||
}
|
||||
|
||||
// 每月执行一次
|
||||
// @param ctx 上下文
|
||||
// @param taskId 任务ID
|
||||
@@ -468,7 +359,7 @@ func (c *Cluster) watch() {
|
||||
go func() {
|
||||
for {
|
||||
|
||||
if !c.canRun() {
|
||||
if !c.priority.IsLatest(c.ctx) {
|
||||
// 如果全局优先级不满足就不执行
|
||||
time.Sleep(time.Second * 5)
|
||||
continue
|
||||
@@ -502,7 +393,7 @@ func (c *Cluster) watch() {
|
||||
go func() {
|
||||
for {
|
||||
|
||||
if !c.canRun() {
|
||||
if !c.priority.IsLatest(c.ctx) {
|
||||
// 如果全局优先级不满足就不执行
|
||||
time.Sleep(time.Second * 5)
|
||||
continue
|
||||
|
||||
Reference in New Issue
Block a user