GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-08-08 23:33:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: worker missing state

Browse Source
This commit is contained in:
徐聪
2022-07-15 17:47:19 +08:00
parent dce866c728
commit d7e56d285e
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hrp/internal/boomer/boomer.go
View File

@@ -499,7 +499,7 @@ func (b *Boomer) GetWorkersInfo() []WorkerNode {
// GetMasterInfo gets master information // GetMasterInfo gets master information
func (b *Boomer) GetMasterInfo() map[string]interface{} { func (b *Boomer) GetMasterInfo() map[string]interface{} {
masterInfo := make(map[string]interface{}) masterInfo := make(map[string]interface{})
masterInfo["state"] = getStateName(b.masterRunner.getState()) masterInfo["state"] = b.masterRunner.getState()
masterInfo["workers"] = b.masterRunner.server.getClientsLength() masterInfo["workers"] = b.masterRunner.server.getClientsLength()
masterInfo["target_users"] = b.masterRunner.getSpawnCount() masterInfo["target_users"] = b.masterRunner.getSpawnCount()
return masterInfo return masterInfo

16
hrp/internal/boomer/runner.go
View File

@@ -874,8 +874,11 @@ func (r *workerRunner) run() {
} }
r.updateState(StateInit) r.updateState(StateInit)
} }
if atomic.LoadInt32(&r.client.failCount) > 2 { if atomic.LoadInt32(&r.client.failCount) > 3 {
r.updateState(StateMissing) go r.stop()
if !r.isStarting() && !r.isStopping() {
r.updateState(StateMissing)
}
} }
CPUUsage := GetCurrentCPUPercent() CPUUsage := GetCurrentCPUPercent()
MemoryUsage := GetCurrentMemoryPercent() MemoryUsage := GetCurrentMemoryPercent()
@@ -1007,12 +1010,15 @@ func (r *masterRunner) heartbeatWorker() {
if !ok { if !ok {
log.Error().Msg("failed to get worker information") log.Error().Msg("failed to get worker information")
} }
if atomic.LoadInt32(&workerInfo.Heartbeat) <= 0 { if atomic.LoadInt32(&workerInfo.Heartbeat) < 0 {
if workerInfo.getState() == StateQuitting {
return true
}
if workerInfo.getState() != StateMissing { if workerInfo.getState() != StateMissing {
workerInfo.setState(StateMissing) workerInfo.setState(StateMissing)
} }
if r.getState() == StateRunning { if r.isStopping() {
// all running workers missed, stopping runner // all running workers missed, setting state to stopped
if r.server.getClientsLength() <= 0 { if r.server.getClientsLength() <= 0 {
r.updateState(StateStopped) r.updateState(StateStopped)
} }