-
Notifications
You must be signed in to change notification settings - Fork 103
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
Customizable system resources configuration #95
Open
mvisonneau
wants to merge
1
commit into
vmihailenco:v3
Choose a base branch
from
mvisonneau:customizable_system_resources
base: v3
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+115
−39
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
package taskq | ||
|
||
const ( | ||
defaultSystemResourcesLoad1PerCPU float64 = 1.5 | ||
defaultSystemResourcesMemoryFreeMB uint64 = 2e5 | ||
defaultSystemResourcesMemoryFreePercentage uint64 = 5 | ||
) | ||
|
||
// SystemResources represents system related values | ||
type SystemResources struct { | ||
// Maximum per CPU load at 1min intervals | ||
Load1PerCPU float64 | ||
|
||
// Minimum free memory required in megabytes | ||
MemoryFreeMB uint64 | ||
|
||
// Minimum free memory required in percentage | ||
MemoryFreePercentage uint64 | ||
} | ||
|
||
// NewDefaultSystemResources returns a new SystemResources struct with some default values | ||
func NewDefaultSystemResources() SystemResources { | ||
return SystemResources{ | ||
Load1PerCPU: defaultSystemResourcesLoad1PerCPU, | ||
MemoryFreeMB: defaultSystemResourcesMemoryFreeMB, | ||
MemoryFreePercentage: defaultSystemResourcesMemoryFreePercentage, | ||
} | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
// +build linux | ||
|
||
package taskq | ||
|
||
import ( | ||
"runtime" | ||
|
||
"github.com/capnm/sysinfo" | ||
"github.com/vmihailenco/taskq/v3/internal" | ||
) | ||
|
||
func hasFreeSystemResources(sr SystemResources) bool { | ||
si := sysinfo.Get() | ||
free := si.FreeRam + si.BufferRam | ||
|
||
if sr.Load1PerCPU > 0 && si.Loads[0] > sr.Load1PerCPU*float64(runtime.NumCPU()) { | ||
internal.Logger.Println("taskq: consumer memory is lower than required") | ||
return false | ||
} | ||
|
||
if sr.MemoryFreeMB > 0 && free < sr.MemoryFreeMB { | ||
internal.Logger.Println("taskq: consumer memory is lower than required") | ||
return false | ||
} | ||
|
||
if sr.MemoryFreePercentage > 0 && free/si.TotalRam < sr.MemoryFreePercentage/100 { | ||
internal.Logger.Println("taskq: consumer memory is lower than required") | ||
return false | ||
} | ||
|
||
return true | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
package taskq | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/stretchr/testify/assert" | ||
) | ||
|
||
func TestHasFreeSystemResources(t *testing.T) { | ||
// TODO: Manage to mock capnm/sysinfo | ||
assert.True(t, hasFreeSystemResources(SystemResources{})) | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
// +build !linux | ||
|
||
package taskq | ||
|
||
func hasFreeSystemResources(_ SystemResources) bool { | ||
return true | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
package taskq | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/stretchr/testify/assert" | ||
) | ||
|
||
func TestHasFreeSystemResources(t *testing.T) { | ||
assert.True(t, hasFreeSystemResources(SystemResources{})) | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package taskq | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/stretchr/testify/assert" | ||
) | ||
|
||
func TestNewDefaultSystemResources(t *testing.T) { | ||
expectedValue := SystemResources{ | ||
Load1PerCPU: 1.5, | ||
MemoryFreeMB: 2e5, | ||
MemoryFreePercentage: 5, | ||
} | ||
assert.Equal(t, expectedValue, NewDefaultSystemResources()) | ||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I need to fix a typo here