Antivirus workers #10383
Merged
Antivirus workers #10383
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
butonic
force-pushed
the
antivirus-workers
branch
from
8269520 to
775f75f
Compare
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
|
Will this go into 7.0 ? |
mmattel
reviewed
Oct 22, 2024
|
|
||
| Service Service `yaml:"-"` | ||
|
|
||
| Tracing *Tracing `yaml:"tracing"` | ||
|
|
||
| InfectedFileHandling string `yaml:"infected-file-handling" env:"ANTIVIRUS_INFECTED_FILE_HANDLING" desc:"Defines the behaviour when a virus has been found. Supported options are: 'delete', 'continue' and 'abort '. Delete will delete the file. Continue will mark the file as infected but continues further processing. Abort will keep the file in the uploads folder for further admin inspection and will not move it to its final destination." introductionVersion:"pre5.0"` | ||
| Events Events | ||
| Scanner Scanner | ||
| MaxScanSize string `yaml:"max-scan-size" env:"ANTIVIRUS_MAX_SCAN_SIZE" desc:"The maximum scan size the virus scanner can handle. Only this many bytes of a file will be scanned. 0 means unlimited and is the default. Usable common abbreviations: [KB, KiB, MB, MiB, GB, GiB, TB, TiB, PB, PiB, EB, EiB], example: 2GB." introductionVersion:"pre5.0"` | ||
| Workers int `yaml:"workers" env:"ANTIVIRUS_WORKERS" desc:"The number of concurrent go routines that fetch events from the event queue." introductionVersion:"6.7"` |
There was a problem hiding this comment.
If we build a 6.7, this is ok,
else we need to set this to 7.0.0
or %%NEXT%% if that goes into a release after 7.0
2403905
reviewed
Oct 22, 2024
| wg.Add(1) | ||
| go func() { | ||
| defer wg.Done() | ||
| for e := range ch { |
There was a problem hiding this comment.
This loop never breaks because we are not closing a channel ch
There was a problem hiding this comment.
It could be like this, but graceful shutdown anyway not working
wg := sync.WaitGroup{}
for i := 0; i < av.c.Workers; i++ {
wg.Add(1)
go func() {
defer wg.Done()
for {
select {
case e, ok := <-ch:
if !ok {
return
}
err := av.processEvent(e, natsStream)
if err != nil {
switch {
case errors.Is(err, ErrFatal):
av.l.Fatal().Err(err).Msg("fatal error - exiting")
case errors.Is(err, ErrEvent):
av.l.Error().Err(err).Msg("continuing")
default:
av.l.Fatal().Err(err).Msg("unknown error - exiting")
}
}
case <-av.c.Context.Done():
av.l.Debug().Msg("antivirus worker stopped")
return
}
}
}()
}
wg.Wait()
There was a problem hiding this comment.
Let's go for it as is. We can later rework for graceful shutdowns.
|
2403905
approved these changes
Oct 23, 2024
14 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We made the number of go routines that pull events from the queue configurable.
related: #10259
@kobergj I set the default to 10 to make configuring the amount of required memory easier. In kubernetes we can then set the memory request lower than
ANTIVIRUS_MAX_SCAN_SIZE(memory limit toANTIVIRUS_WORKERS*ANTIVIRUS_MAX_SCAN_SIZE)