From 61c34bfd16953e5e056a2fa83fdd4ccb394facd3 Mon Sep 17 00:00:00 2001 From: machongwei Date: Wed, 10 Aug 2022 21:39:15 +0800 Subject: [PATCH 1/5] feat: hrp boom support set run time --- hrp/boomer.go | 2 ++ hrp/cmd/boom.go | 2 ++ hrp/internal/boomer/boomer.go | 15 +++++++++++++++ hrp/internal/boomer/runner.go | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+) diff --git a/hrp/boomer.go b/hrp/boomer.go index c8cd9349..81408432 100644 --- a/hrp/boomer.go +++ b/hrp/boomer.go @@ -66,6 +66,7 @@ func (b *HRPBoomer) InitBoomer() { } b.SetSpawnCount(b.GetProfile().SpawnCount) b.SetSpawnRate(b.GetProfile().SpawnRate) + b.SetRunTime(b.GetProfile().RunTime) if b.GetProfile().LoopCount > 0 { b.SetLoopCount(b.GetProfile().LoopCount) } @@ -232,6 +233,7 @@ func (b *HRPBoomer) rebalanceBoomer(profile *boomer.Profile) { b.SetProfile(profile) b.SetSpawnCount(b.GetProfile().SpawnCount) b.SetSpawnRate(b.GetProfile().SpawnRate) + b.SetRunTime(b.GetProfile().RunTime) b.GetRebalanceChan() <- true log.Info().Interface("profile", profile).Msg("rebalance tasks successful") } diff --git a/hrp/cmd/boom.go b/hrp/cmd/boom.go index 7a267b4d..afe10253 100644 --- a/hrp/cmd/boom.go +++ b/hrp/cmd/boom.go @@ -67,6 +67,7 @@ var boomCmd = &cobra.Command{ hrpBoomer.SetExpectWorkers(boomArgs.expectWorkers, boomArgs.expectWorkersMaxWait) hrpBoomer.SetSpawnCount(boomArgs.SpawnCount) hrpBoomer.SetSpawnRate(boomArgs.SpawnRate) + hrpBoomer.SetRunTime(boomArgs.RunTime) } if boomArgs.autoStart { hrpBoomer.InitBoomer() @@ -116,6 +117,7 @@ func init() { boomCmd.Flags().StringVar(&boomArgs.RequestIncreaseRate, "request-increase-rate", "-1", "Request increase rate, disabled by default.") boomCmd.Flags().Int64Var(&boomArgs.SpawnCount, "spawn-count", 1, "The number of users to spawn for load testing") boomCmd.Flags().Float64Var(&boomArgs.SpawnRate, "spawn-rate", 1, "The rate for spawning users") + boomCmd.Flags().Int64Var(&boomArgs.RunTime, "run-time", 0, "Stop after the specified amount of time(s), Only used --autostart. Defaults to run forever.") boomCmd.Flags().Int64Var(&boomArgs.LoopCount, "loop-count", -1, "The specify running cycles for load testing") boomCmd.Flags().StringVar(&boomArgs.MemoryProfile, "mem-profile", "", "Enable memory profiling.") boomCmd.Flags().DurationVar(&boomArgs.MemoryProfileDuration, "mem-profile-duration", 30*time.Second, "Memory profile duration.") diff --git a/hrp/internal/boomer/boomer.go b/hrp/internal/boomer/boomer.go index da7ac054..6c700229 100644 --- a/hrp/internal/boomer/boomer.go +++ b/hrp/internal/boomer/boomer.go @@ -50,6 +50,7 @@ type Boomer struct { type Profile struct { SpawnCount int64 `json:"spawn-count,omitempty" yaml:"spawn-count,omitempty" mapstructure:"spawn-count,omitempty"` SpawnRate float64 `json:"spawn-rate,omitempty" yaml:"spawn-rate,omitempty" mapstructure:"spawn-rate,omitempty"` + RunTime int64 `json:"run-time,omitempty" yaml:"run-time,omitempty" mapstructure:"run-time,omitempty"` MaxRPS int64 `json:"max-rps,omitempty" yaml:"max-rps,omitempty" mapstructure:"max-rps,omitempty"` LoopCount int64 `json:"loop-count,omitempty" yaml:"loop-count,omitempty" mapstructure:"loop-count,omitempty"` RequestIncreaseRate string `json:"request-increase-rate,omitempty" yaml:"request-increase-rate,omitempty" mapstructure:"request-increase-rate,omitempty"` @@ -251,6 +252,18 @@ func (b *Boomer) SetSpawnRate(spawnRate float64) { } } +// SetRunTime sets run time +func (b *Boomer) SetRunTime(spawnRate int64) { + switch b.mode { + case DistributedMasterMode: + b.masterRunner.setRunTime(spawnRate) + case DistributedWorkerMode: + b.workerRunner.setRunTime(spawnRate) + default: + b.localRunner.setRunTime(spawnRate) + } +} + // SetExpectWorkers sets expect workers while load testing func (b *Boomer) SetExpectWorkers(expectWorkers int, expectWorkersMaxWait int) { b.masterRunner.setExpectWorkers(expectWorkers, expectWorkersMaxWait) @@ -471,6 +484,7 @@ func (b *Boomer) Start(Args *Profile) error { } b.SetSpawnCount(Args.SpawnCount) b.SetSpawnRate(Args.SpawnRate) + b.SetRunTime(Args.RunTime) b.SetProfile(Args) err := b.masterRunner.start() return err @@ -483,6 +497,7 @@ func (b *Boomer) ReBalance(Args *Profile) error { } b.SetSpawnCount(Args.SpawnCount) b.SetSpawnRate(Args.SpawnRate) + b.SetRunTime(Args.RunTime) b.SetProfile(Args) err := b.masterRunner.rebalance() if err != nil { diff --git a/hrp/internal/boomer/runner.go b/hrp/internal/boomer/runner.go index 503ffbaa..43c5fcfb 100644 --- a/hrp/internal/boomer/runner.go +++ b/hrp/internal/boomer/runner.go @@ -195,6 +195,7 @@ type runner struct { spawnCount int64 // target clients to spawn spawnRate float64 + runTime int64 controller *Controller loop *Loop // specify loop count for testcase, count = loopCount * spawnCount @@ -238,6 +239,20 @@ func (r *runner) getSpawnRate() float64 { return r.spawnRate } +func (r *runner) setRunTime(runTime int64) { + r.mutex.Lock() + defer r.mutex.Unlock() + if runTime > 0 { + r.runTime = time.Now().Unix() + runTime + } +} + +func (r *runner) getRunTime() int64 { + r.mutex.RLock() + defer r.mutex.RUnlock() + return r.runTime +} + func (r *runner) getSpawnCount() int64 { return atomic.LoadInt64(&r.spawnCount) } @@ -364,6 +379,15 @@ func (r *runner) reset() { r.reportedChan = make(chan bool) } +func (r *runner) runTimeCheck(runTime int64) { + for range time.Tick(time.Second * 3) { + nowTime := time.Now().Unix() + if nowTime > runTime { + r.stop() + } + } +} + func (r *runner) spawnWorkers(spawnCount int64, spawnRate float64, quit chan bool, spawnCompleteFunc func()) { r.updateState(StateSpawning) log.Info(). @@ -622,6 +646,11 @@ func (r *localRunner) start() { // output setup r.outputOnStart() + runTime := r.getRunTime() + if runTime != 0 { + go r.runTimeCheck(runTime) + } + go r.spawnWorkers(r.getSpawnCount(), r.getSpawnRate(), r.stoppingChan, nil) defer func() { @@ -912,6 +941,11 @@ func (r *workerRunner) start() { r.outputOnStart() + runTime := r.getRunTime() + if runTime != 0 { + go r.runTimeCheck(runTime) + } + go r.spawnWorkers(r.getSpawnCount(), r.getSpawnRate(), r.stoppingChan, r.spawnComplete) defer func() { From a2352d627f0df5f461fdf7f50da91a35b65df473 Mon Sep 17 00:00:00 2001 From: machongwei Date: Wed, 10 Aug 2022 21:59:16 +0800 Subject: [PATCH 2/5] feat: hrp boom support set run time --- hrp/internal/boomer/boomer.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hrp/internal/boomer/boomer.go b/hrp/internal/boomer/boomer.go index 6c700229..58b8f56c 100644 --- a/hrp/internal/boomer/boomer.go +++ b/hrp/internal/boomer/boomer.go @@ -253,14 +253,14 @@ func (b *Boomer) SetSpawnRate(spawnRate float64) { } // SetRunTime sets run time -func (b *Boomer) SetRunTime(spawnRate int64) { +func (b *Boomer) SetRunTime(runTime int64) { switch b.mode { case DistributedMasterMode: - b.masterRunner.setRunTime(spawnRate) + b.masterRunner.setRunTime(runTime) case DistributedWorkerMode: - b.workerRunner.setRunTime(spawnRate) + b.workerRunner.setRunTime(runTime) default: - b.localRunner.setRunTime(spawnRate) + b.localRunner.setRunTime(runTime) } } From 8ae5ba81bca7f583de78e517049210761657b151 Mon Sep 17 00:00:00 2001 From: machongwei Date: Wed, 10 Aug 2022 22:03:24 +0800 Subject: [PATCH 3/5] feat: hrp boom support set run time --- hrp/internal/boomer/runner.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/hrp/internal/boomer/runner.go b/hrp/internal/boomer/runner.go index 43c5fcfb..fce9fa83 100644 --- a/hrp/internal/boomer/runner.go +++ b/hrp/internal/boomer/runner.go @@ -380,10 +380,15 @@ func (r *runner) reset() { } func (r *runner) runTimeCheck(runTime int64) { + if runTime <= 0 { + return + } + for range time.Tick(time.Second * 3) { nowTime := time.Now().Unix() if nowTime > runTime { r.stop() + return } } } @@ -646,10 +651,7 @@ func (r *localRunner) start() { // output setup r.outputOnStart() - runTime := r.getRunTime() - if runTime != 0 { - go r.runTimeCheck(runTime) - } + go r.runTimeCheck(r.getRunTime()) go r.spawnWorkers(r.getSpawnCount(), r.getSpawnRate(), r.stoppingChan, nil) @@ -941,10 +943,7 @@ func (r *workerRunner) start() { r.outputOnStart() - runTime := r.getRunTime() - if runTime != 0 { - go r.runTimeCheck(runTime) - } + go r.runTimeCheck(r.getRunTime()) go r.spawnWorkers(r.getSpawnCount(), r.getSpawnRate(), r.stoppingChan, r.spawnComplete) From e072bc9626e19d320025b60ea724992400b8bdd4 Mon Sep 17 00:00:00 2001 From: machongwei Date: Thu, 18 Aug 2022 20:09:46 +0800 Subject: [PATCH 4/5] perf: hrp boom run time related code optimization --- hrp/internal/boomer/runner.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/hrp/internal/boomer/runner.go b/hrp/internal/boomer/runner.go index fce9fa83..4a3d71ef 100644 --- a/hrp/internal/boomer/runner.go +++ b/hrp/internal/boomer/runner.go @@ -240,17 +240,11 @@ func (r *runner) getSpawnRate() float64 { } func (r *runner) setRunTime(runTime int64) { - r.mutex.Lock() - defer r.mutex.Unlock() - if runTime > 0 { - r.runTime = time.Now().Unix() + runTime - } + atomic.StoreInt64(&r.runTime, time.Now().Unix()+runTime) } func (r *runner) getRunTime() int64 { - r.mutex.RLock() - defer r.mutex.RUnlock() - return r.runTime + return atomic.LoadInt64(&r.runTime) } func (r *runner) getSpawnCount() int64 { @@ -384,11 +378,17 @@ func (r *runner) runTimeCheck(runTime int64) { return } - for range time.Tick(time.Second * 3) { - nowTime := time.Now().Unix() - if nowTime > runTime { - r.stop() + var ticker = time.NewTicker(time.Second * 3) + for { + select { + case <-r.stopChan: return + case <-ticker.C: + nowTime := time.Now().Unix() + if nowTime > runTime { + r.stop() + return + } } } } From 07c1f78364ae9e4960f88ce2a53ab389797ec58b Mon Sep 17 00:00:00 2001 From: machongwei Date: Sun, 21 Aug 2022 09:11:58 +0800 Subject: [PATCH 5/5] merge upstream master change --- hrp/boomer.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hrp/boomer.go b/hrp/boomer.go index 8f3cad39..e8ea55fc 100644 --- a/hrp/boomer.go +++ b/hrp/boomer.go @@ -245,15 +245,14 @@ func (b *HRPBoomer) initWorker(profile *boomer.Profile) { b.InitBoomer() } -func (b *HRPBoomer) rebalanceBoomer(profile *boomer.Profile) { - b.SetProfile(profile) - b.SetSpawnCount(b.GetProfile().SpawnCount) - b.SetSpawnRate(b.GetProfile().SpawnRate) - b.SetRunTime(b.GetProfile().RunTime) +func (b *HRPBoomer) rebalanceRunner(profile *boomer.Profile) { + b.SetSpawnCount(profile.SpawnCount) + b.SetSpawnRate(profile.SpawnRate) b.GetRebalanceChan() <- true log.Info().Interface("profile", profile).Msg("rebalance tasks successfully") } + func (b *HRPBoomer) PollTasks(ctx context.Context) { for { select {