pkg/timerx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交

Browse Source
This commit is contained in:
Yun
2023-09-02 12:19:27 +08:00
parent 1d37696815
commit 9622d9f5b9
4 changed files with 108 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cluster.go
+35 -25
View File
@@ -26,6 +26,7 @@ type cluster struct {
lockKey string // 全局计算的key lockKey string // 全局计算的key
nextKey string // 下一次执行的key nextKey string // 下一次执行的key
zsetKey string // 有序集合的key zsetKey string // 有序集合的key
listKey string // 可执行的任务列表的key
} }
var clu *cluster = nil var clu *cluster = nil
@@ -38,8 +39,12 @@ func InitCluster(ctx context.Context, red *redis.Client) *cluster {
lockKey: "timer:globalLockKey", lockKey: "timer:globalLockKey",
nextKey: "timer:NextKey", nextKey: "timer:NextKey",
zsetKey: "timer:zsetKey", zsetKey: "timer:zsetKey",
listKey: "timer:listKey",
} }
// 监听任务
go clu.watch()
timer := time.NewTicker(time.Millisecond * 100) timer := time.NewTicker(time.Millisecond * 100)
go func(ctx context.Context, red *redis.Client) { go func(ctx context.Context, red *redis.Client) {
@@ -47,8 +52,8 @@ func InitCluster(ctx context.Context, red *redis.Client) *cluster {
for { for {
select { select {
case <-timer.C: case <-timer.C:
go clu.computeTime() clu.getTask()
go clu.getTask() clu.getNextTime()
case <-ctx.Done(): case <-ctx.Done():
break Loop break Loop
} }
@@ -115,7 +120,8 @@ func (c *cluster) AddTimer(ctx context.Context, uniqueKey string, spaceTime time
} }
// 计算下一次执行的时间 // 计算下一次执行的时间
func (c *cluster) computeTime() { func (c *cluster) getNextTime() {
// log.Println("begin computer") // log.Println("begin computer")
ctx, cancel := context.WithCancel(c.ctx) ctx, cancel := context.WithCancel(c.ctx)
defer cancel() defer cancel()
@@ -124,7 +130,7 @@ func (c *cluster) computeTime() {
// 获取锁 // 获取锁
lockBool := lock.Lock() lockBool := lock.Lock()
if !lockBool { if !lockBool {
log.Println("timer:获取锁失败") // log.Println("timer:获取锁失败")
return return
} }
defer lock.Unlock() defer lock.Unlock()
@@ -139,19 +145,14 @@ func (c *cluster) computeTime() {
execTime := make(map[string]time.Time) execTime := make(map[string]time.Time)
json.Unmarshal([]byte(cacheStr), &execTime) json.Unmarshal([]byte(cacheStr), &execTime)
// log.Println("cacheStr:", cacheStr, execTime)
// return
p := c.redis.Pipeline() p := c.redis.Pipeline()
nowTime := time.Now() nowTime := time.Now()
clusterWorkerList.Range(func(key, value interface{}) bool { clusterWorkerList.Range(func(key, value interface{}) bool {
// log.Println("range:", key, value)
val := value.(timerStr) val := value.(timerStr)
beforeTime := execTime[val.UniqueKey] beforeTime := execTime[val.UniqueKey]
if beforeTime.After(nowTime) { if beforeTime.After(nowTime) {
// log.Println("sssss")
return true return true
} }
nextTime := getNextExecTime(beforeTime, val.SpaceTime) nextTime := getNextExecTime(beforeTime, val.SpaceTime)
@@ -161,21 +162,16 @@ func (c *cluster) computeTime() {
Score: float64(nextTime.UnixMilli()), Score: float64(nextTime.UnixMilli()),
Member: val.UniqueKey, Member: val.UniqueKey,
}) })
// log.Println("ffffffffffff") // log.Println("computeTime add", c.zsetKey, val.UniqueKey, nextTime.UnixMilli())
return true return true
}) })
// log.Println("ssssssddddd")
// 更新缓存 // 更新缓存
b, _ := json.Marshal(execTime) b, _ := json.Marshal(execTime)
p.Set(ctx, c.nextKey, string(b), 0) p.Set(ctx, c.nextKey, string(b), 0)
// log.Println("B", string(b))
_, err := p.Exec(ctx) _, err := p.Exec(ctx)
_ = err _ = err
// fmt.Println(err)
} }
// 递归遍历获取执行时间 // 递归遍历获取执行时间
@@ -185,9 +181,6 @@ func getNextExecTime(beforeTime time.Time, spaceTime time.Duration) time.Time {
return beforeTime return beforeTime
} }
nextTime := beforeTime.Add(spaceTime) nextTime := beforeTime.Add(spaceTime)
// fmt.Println(nextTime.Format(time.RFC3339))
// fmt.Println(nowTime.Format(time.RFC3339))
// fmt.Println(beforeTime.Before(nowTime))
if nextTime.Before(nowTime) { if nextTime.Before(nowTime) {
nextTime = getNextExecTime(nextTime, spaceTime) nextTime = getNextExecTime(nextTime, spaceTime)
} }
@@ -204,17 +197,33 @@ func (c *cluster) getTask() {
taskList, _ := c.redis.ZRangeByScore(c.ctx, c.zsetKey, &zb).Result() taskList, _ := c.redis.ZRangeByScore(c.ctx, c.zsetKey, &zb).Result()
// 删除粉丝 p := c.redis.Pipeline()
inter := []interface{}{}
for _, val := range taskList {
inter = append(inter, val)
}
c.redis.ZRem(c.ctx, c.zsetKey, inter...)
for _, val := range taskList { for _, val := range taskList {
// 添加到可执行队列
p.LPush(c.ctx, c.listKey, val)
// 删除有序集合
p.ZRem(c.ctx, c.zsetKey, val)
}
_, err := p.Exec(c.ctx)
// fmt.Println(err)
_ = err
}
// 监听任务
func (c *cluster) watch() {
// 执行任务
for {
keys, err := c.redis.BLPop(c.ctx, time.Second*10, c.listKey).Result()
if err != nil {
fmt.Println("watch err:", err)
continue
}
for _, val := range keys {
go doTask(c.ctx, c.redis, val) go doTask(c.ctx, c.redis, val)
} }
}
} }
// 执行任务 // 执行任务
@@ -239,6 +248,7 @@ func doTask(ctx context.Context, red *redis.Client, taskId string) {
lock := lockx.NewGlobalLock(ctx, red, taskId) lock := lockx.NewGlobalLock(ctx, red, taskId)
tB := lock.Lock() tB := lock.Lock()
if !tB { if !tB {
fmt.Println("doTask timer:获取锁失败")
return return
} }
defer lock.Unlock() defer lock.Unlock()
cmd/main.go
+40 -40
View File
@@ -44,46 +44,46 @@ func re() {
"test": "text1", "test": "text1",
}, },
}) })
cl.AddTimer(ctx, "test2", 1*time.Second, aa, timer.ExtendParams{ // cl.AddTimer(ctx, "test2", 1*time.Second, aa, timer.ExtendParams{
Params: map[string]interface{}{ // Params: map[string]interface{}{
"test": "text2", // "test": "text2",
}, // },
}) // })
cl.AddTimer(ctx, "test3", 1*time.Second, aa, timer.ExtendParams{ // cl.AddTimer(ctx, "test3", 1*time.Second, aa, timer.ExtendParams{
Params: map[string]interface{}{ // Params: map[string]interface{}{
"test": "text3", // "test": "text3",
}, // },
}) // })
cl.AddTimer(ctx, "test4", 1*time.Second, aa, timer.ExtendParams{ // cl.AddTimer(ctx, "test4", 1*time.Second, aa, timer.ExtendParams{
Params: map[string]interface{}{ // Params: map[string]interface{}{
"test": "text4", // "test": "text4",
}, // },
}) // })
cl.AddTimer(ctx, "test5", 1*time.Second, aa, timer.ExtendParams{ // cl.AddTimer(ctx, "test5", 1*time.Second, aa, timer.ExtendParams{
Params: map[string]interface{}{ // Params: map[string]interface{}{
"test": "text5", // "test": "text5",
}, // },
}) // })
cl.AddTimer(ctx, "test6", 1*time.Second, aa, timer.ExtendParams{ // cl.AddTimer(ctx, "test6", 1*time.Second, aa, timer.ExtendParams{
Params: map[string]interface{}{ // Params: map[string]interface{}{
"test": "text6", // "test": "text6",
}, // },
}) // })
cl.AddTimer(ctx, "test7", 1*time.Second, aa, timer.ExtendParams{ // cl.AddTimer(ctx, "test7", 1*time.Second, aa, timer.ExtendParams{
Params: map[string]interface{}{ // Params: map[string]interface{}{
"test": "text7", // "test": "text7",
}, // },
}) // })
cl.AddTimer(ctx, "test8", 1*time.Second, aa, timer.ExtendParams{ // cl.AddTimer(ctx, "test8", 1*time.Second, aa, timer.ExtendParams{
Params: map[string]interface{}{ // Params: map[string]interface{}{
"test": "text8", // "test": "text8",
}, // },
}) // })
cl.AddTimer(ctx, "test9", 1*time.Second, aa, timer.ExtendParams{ // cl.AddTimer(ctx, "test9", 1*time.Second, aa, timer.ExtendParams{
Params: map[string]interface{}{ // Params: map[string]interface{}{
"test": "text9", // "test": "text9",
}, // },
}) // })
select {} select {}
} }
lockx/lockx.go
+9 -3
View File
@@ -30,12 +30,18 @@ func NewGlobalLock(ctx context.Context, red *redis.Client, uniqueKey string) *gl
func (g *globalLock) Lock() bool { func (g *globalLock) Lock() bool {
script := ` script := `
local token = redis.call('get',KEYS[1])
if token == false
then
return redis.call('set',KEYS[1],ARGV[1],'EX',ARGV[2]) return redis.call('set',KEYS[1],ARGV[1],'EX',ARGV[2])
end
return 'ERROR'
` `
resp, err := g.redis.Eval(g.ctx, script, []string{g.uniqueKey}, g.value, 10).Result() resp, err := g.redis.Eval(g.ctx, script, []string{g.uniqueKey}, g.value, 10).Result()
if resp != "OK" { if resp != "OK" {
log.Println("globalLock Lock", resp, err) _ = err
// log.Println("globalLock Lock", resp, err, g.uniqueKey, g.value)
} }
return resp == "OK" return resp == "OK"
} }
@@ -66,7 +72,7 @@ func (g *globalLock) Unlock() bool {
resp, err := g.redis.Eval(g.ctx, script, []string{g.uniqueKey}, g.value).Result() resp, err := g.redis.Eval(g.ctx, script, []string{g.uniqueKey}, g.value).Result()
if resp != "OK" { if resp != "OK" {
log.Println("globalLock Unlock", resp, err) log.Println("globalLock Unlock", resp, err, g.uniqueKey, g.value)
} }
return resp == "OK" return resp == "OK"
} }
@@ -103,7 +109,7 @@ func (g *globalLock) refresh() bool {
resp, err := g.redis.Eval(g.ctx, script, []string{g.uniqueKey}, g.value, 5).Result() resp, err := g.redis.Eval(g.ctx, script, []string{g.uniqueKey}, g.value, 5).Result()
if resp != "OK" { if resp != "OK" {
log.Println("globalLock refresh", resp, err) log.Println("globalLock refresh", resp, err, g.uniqueKey, g.value)
} }
return resp == "OK" return resp == "OK"
} }
lockx/lockx_test.go
+19 -8
View File
@@ -11,7 +11,21 @@ import (
var Redis *redis.Client var Redis *redis.Client
func TestMain(m *testing.M) { // func TestMain(m *testing.M) {
// client := redis.NewClient(&redis.Options{
// Addr: "127.0.0.1" + ":" + "6379",
// Password: "", // no password set
// DB: 0, // use default DB
// })
// if client == nil {
// fmt.Println("redis init error")
// return
// }
// // fmt.Println("ffff")
// Redis = client
// }
func TestLockx(t *testing.T) {
client := redis.NewClient(&redis.Options{ client := redis.NewClient(&redis.Options{
Addr: "127.0.0.1" + ":" + "6379", Addr: "127.0.0.1" + ":" + "6379",
Password: "", // no password set Password: "", // no password set
@@ -21,22 +35,19 @@ func TestMain(m *testing.M) {
fmt.Println("redis init error") fmt.Println("redis init error")
return return
} }
Redis = client fmt.Println("begin")
}
func TestLockx(t *testing.T) {
ctx := context.Background() ctx := context.Background()
ctx, cancel := context.WithCancel(ctx) ctx, cancel := context.WithCancel(ctx)
defer cancel() defer cancel()
lock := lockx.NewGlobalLock(ctx, Redis, "lockx:test") lock := lockx.NewGlobalLock(ctx, client, "lockx:test")
if !lock.Lock() { if !lock.Lock() {
t.Log("lock error") fmt.Println("lock error")
} }
defer lock.Unlock() defer lock.Unlock()
lock.Refresh() lock.Refresh()
t.Log("doing") fmt.Println("ssss")
} }