This repository has been archived by the owner on Nov 29, 2021. It is now read-only.
Queue wait time (backport #401) #403
Merged
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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
Currently the queue system in ospd prevents to start a new scan if there is not enough available memory. This produces that new scans are put in the queue, while the memory condition is not satisfied. Once some memory is released, all scans in queue are started. In the issue mentioned above, I pasted what I found in the log. This avoids ospd to start many queued scans simultaneously. So the last started scan has time enough to take some memory (launch some child processes). (cherry picked from commit 983eff2)
…queue option It doesn't make sense to wait time if the option is disabled. Also, use global definition for the waiting time in seconds. (cherry picked from commit fdca890)
Could be possible that there last scan finished in a few seconds. Therefore check for running scans. Although, enough available memory is still a conditional, if enabled. (cherry picked from commit fa2cf78)
(cherry picked from commit c2fb9e4) # Conflicts: # CHANGELOG.md
…n is not in the queue anymore (cherry picked from commit 2acd57f)
Codecov Report
@@ Coverage Diff @@
## master #403 +/- ##
==========================================
+ Coverage 75.07% 75.20% +0.13%
==========================================
Files 23 23
Lines 2668 2682 +14
==========================================
+ Hits 2003 2017 +14
Misses 665 665
Continue to review full report at Codecov.
|
jjnicola
approved these changes
May 26, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This is an automatic backport of pull request #401 done by Mergify.
Cherry-pick of c2fb9e4 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.io/