Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(checker): fix checker settings #972

Merged
merged 2 commits into from
Dec 18, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions checker/worker/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package worker

import (
"errors"
"runtime"
"sync/atomic"
"time"

Expand Down Expand Up @@ -127,17 +126,8 @@ func (check *Checker) startCheckerWorker(w checkerWorker) error {
return nil
}

maxParallelChecks := w.MaxParallelChecks()
if maxParallelChecks == 0 {
maxParallelChecks = runtime.NumCPU()

check.Logger.Info().
Int("number_of_cpu", maxParallelChecks).
Msg("MaxParallel" + w.Name() + "Checks is not configured, set it to the number of CPU")
}

const maxParallelChecksMaxValue = 1024 * 8
if maxParallelChecks > maxParallelChecksMaxValue {
if w.MaxParallelChecks() > maxParallelChecksMaxValue {
return errors.New("MaxParallel" + w.Name() + "Checks value is too large")
}

Expand All @@ -146,10 +136,10 @@ func (check *Checker) startCheckerWorker(w checkerWorker) error {

triggerIdsToCheckChan := check.startTriggerToCheckGetter(
w.GetTriggersToCheck,
maxParallelChecks,
w.MaxParallelChecks(),
)

for i := 0; i < maxParallelChecks; i++ {
for i := 0; i < w.MaxParallelChecks(); i++ {
check.tomb.Go(func() error {
return check.startTriggerHandler(
triggerIdsToCheckChan,
Expand Down
23 changes: 23 additions & 0 deletions cmd/checker/config.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package main

import (
"runtime"

"github.com/moira-alert/moira"
"github.com/moira-alert/moira/checker"
"github.com/moira-alert/moira/cmd"
Expand Down Expand Up @@ -47,6 +49,15 @@ type checkerConfig struct {
MetricEventPopDelay string `yaml:"metric_event_pop_delay"`
}

func handleParallelChecks(parallelChecks *int) bool {
if parallelChecks != nil && *parallelChecks == 0 {
*parallelChecks = runtime.NumCPU()
return true
}

return false
}

func (config *checkerConfig) getSettings(logger moira.Logger) *checker.Config {
logTriggersToLevel := make(map[string]string)
for _, v := range config.SetLogLevel.TriggersToLevel {
Expand All @@ -56,6 +67,18 @@ func (config *checkerConfig) getSettings(logger moira.Logger) *checker.Config {
Int("number_of_triggers", len(logTriggersToLevel)).
Msg("Found dynamic log rules in config for some triggers")

if handleParallelChecks(&config.MaxParallelChecks) {
logger.Info().
Int("number_of_cpu", config.MaxParallelChecks).
Msg("MaxParallelChecks is not configured, set it to the number of CPU")
}

if handleParallelChecks(&config.MaxParallelRemoteChecks) {
logger.Info().
Int("number_of_cpu", config.MaxParallelRemoteChecks).
Msg("MaxParallelRemoteChecks is not configured, set it to the number of CPU")
}

return &checker.Config{
CheckInterval: to.Duration(config.CheckInterval),
LazyTriggersCheckInterval: to.Duration(config.LazyTriggersCheckInterval),
Expand Down
2 changes: 1 addition & 1 deletion database/redis/trigger.go
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ func (connector *DbConnector) GetTriggerIDsStartWith(prefix string) ([]string, e
return matchedTriggers, nil
}

func (connector *DbConnector) updateTrigger(triggerID string, newTrigger *moira.Trigger, oldTrigger *moira.Trigger) error {
func (connector *DbConnector) updateTrigger(triggerID string, newTrigger *moira.Trigger, oldTrigger *moira.Trigger) error { // nolint:gocyclo
bytes, err := reply.GetTriggerBytes(triggerID, newTrigger)
if err != nil {
return err
Expand Down