TODO: 修改到更加优雅

This commit is contained in:
eson 2023-08-01 01:18:55 +08:00
parent b31f933aca
commit 86e6effaa1
4 changed files with 57 additions and 59 deletions

1
go.mod
View File

@ -9,6 +9,7 @@ require (
require (
github.com/474420502/batchexecute v0.0.2 // indirect
github.com/474420502/execute v0.0.1 // indirect
github.com/DataDog/zstd v1.4.5 // indirect
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
github.com/VictoriaMetrics/metrics v1.18.1 // indirect

4
go.sum
View File

@ -2,6 +2,10 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/474420502/batchexecute v0.0.2 h1:gTMyUh2x6HpV7/+nOLj4qFRO/l5/B/eg7dXsHxLJpbg=
github.com/474420502/batchexecute v0.0.2/go.mod h1:IWazO1QTaB5LyWwMxSqIX/6g/UXwwpnqk0AVM5j24J0=
github.com/474420502/execute v0.0.0-20230731165309-2d8b1969ccb7 h1:U0jTaGJGWzJM/mZSN6L8rBfACry8+xJeHRX9t99xxfE=
github.com/474420502/execute v0.0.0-20230731165309-2d8b1969ccb7/go.mod h1:3/9VeQxxZx5lAqz1UWEolgp0OK3hautW9jhMyReuWZc=
github.com/474420502/execute v0.0.1 h1:DCC7RiS+R+fZyw9cpYgCmGfC5iyBljdfpolSN20yVWo=
github.com/474420502/execute v0.0.1/go.mod h1:3/9VeQxxZx5lAqz1UWEolgp0OK3hautW9jhMyReuWZc=
github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=

107
main.go
View File

@ -12,7 +12,7 @@ import (
"syscall"
"time"
"github.com/474420502/batchexecute"
"github.com/474420502/execute"
"github.com/lni/dragonboat/v4"
"github.com/lni/dragonboat/v4/config"
"github.com/lni/dragonboat/v4/logger"
@ -22,58 +22,8 @@ func main() {
}
func BatchFunc(nh *dragonboat.NodeHost) {
BatchQueueExecute = batchexecute.NewBatchExecute[bool](func(params *bool) {
cs := nh.GetNoOPSession(128)
for {
cmd := Command{
Name: "dequeue",
Group: "test",
}
data, err := cmd.Encode()
if err != nil {
log.Println(err)
}
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
result, err := nh.SyncPropose(ctx, cs, data)
cancel()
if err != nil {
log.Println(err)
break
} else {
if len(result.Data) == 0 {
log.Println("wait 10 second")
var m runtime.MemStats
runtime.ReadMemStats(&m)
allocMB := float64(m.Alloc) / 1024 / 1024
totalAllocMB := float64(m.TotalAlloc) / 1024 / 1024
sysMB := float64(m.Sys) / 1024 / 1024
fmt.Printf("Alloc = %.2f MB, TotalAlloc = %.2f MB, Sys = %.2f MB\n", allocMB, totalAllocMB, sysMB)
time.Sleep(time.Second * 10)
break
} else {
var item QueueItem
err := item.Decode(result.Data)
if err != nil {
log.Println(err)
}
log.Println(item)
}
}
}
})
}
var BatchQueueExecute = execute.NewEventTriggeredExecute[bool]()
var Consumption execute.Event
var addresses []string = []string{
"localhost:5500",
@ -156,18 +106,63 @@ func StartNode(replicaID uint64, exampleShardID uint64, addr string) *dragonboat
// RaftAddress is used to identify the NodeHost instance
RaftAddress: nodeAddr,
}
nh, err := dragonboat.NewNodeHost(nhc)
if err != nil {
panic(err)
}
Consumption = BatchQueueExecute.RegisterExecute(func(*bool) {
cs := nh.GetNoOPSession(128)
for {
cmd := Command{
Name: "dequeue",
Group: "test",
}
data, err := cmd.Encode()
if err != nil {
log.Println(err)
}
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
result, err := nh.SyncPropose(ctx, cs, data)
cancel()
if err != nil {
log.Println(err)
break
} else {
if len(result.Data) == 0 {
log.Println("wait 10 second")
var m runtime.MemStats
runtime.ReadMemStats(&m)
allocMB := float64(m.Alloc) / 1024 / 1024
totalAllocMB := float64(m.TotalAlloc) / 1024 / 1024
sysMB := float64(m.Sys) / 1024 / 1024
fmt.Printf("Alloc = %.2f MB, TotalAlloc = %.2f MB, Sys = %.2f MB\n", allocMB, totalAllocMB, sysMB)
time.Sleep(time.Second * 10)
break
} else {
var item QueueItem
err := item.Decode(result.Data)
if err != nil {
log.Println(err)
}
log.Println(item)
}
}
}
}, nil)
if err := nh.StartReplica(initialMembers, false, NewSMQueue, rc); err != nil {
fmt.Fprintf(os.Stderr, "failed to add cluster, %v\n", err)
os.Exit(1)
}
BatchFunc(nh)
return nh
}

4
sm.go
View File

@ -13,8 +13,6 @@ import (
sm "github.com/lni/dragonboat/v4/statemachine"
)
var BatchQueueExecute *batchexecute.BatchExecute[bool]
// SMQueue实现了StateMachine接口,用于管理基于PriorityQueue的消息队列
type SMQueue struct {
// 所属的Shard ID
@ -133,7 +131,7 @@ func (s *SMQueue) Update(e sm.Entry) (result sm.Result, err error) {
Value: cmd.Item,
})
result.Value = uint64(len(d))
go BatchQueueExecute.Execute(nil) // 通知可以执行update
BatchQueueExecute.Notify(Consumption, nil) // 通知可以执行update
return result, err
case "dequeue":
var queue *PriorityQueue[QueueItem]