valitydev/osquery-1
14
0
Fork 0
mirror of https://github.com/valitydev/osquery-1.git synced 2024-11-07 18:08:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1193 from theopolis/fix_scheduler

Browse Source 
Fix the watchdog/scheduler limit tracking
This commit is contained in:
Teddy Reed 2015-06-04 18:01:32 -07:00
commit b1b71d5fd0
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osquery/core/watcher.cpp
View File

@ -32,7 +32,7 @@ namespace osquery {
const std::map<WatchdogLimitType, std::vector<size_t> > kWatchdogLimits = {
// Maximum MB worker can privately allocate.
{MEMORY_LIMIT, {50, 30, 10, 1000}},
{MEMORY_LIMIT, {80, 50, 30, 1000}},
// Percent of user or system CPU worker can utilize for LATENCY_LIMIT
// seconds.
{UTILIZATION_LIMIT, {90, 80, 60, 1000}},
@ -239,7 +239,7 @@ bool WatcherRunner::isChildSane(pid_t child) {
{
WatcherLocker locker;
auto state = Watcher::getState(child);
auto& state = Watcher::getState(child);
try {
parent = AS_LITERAL(BIGINT_LITERAL, rows[0].at("parent"));
user_time = AS_LITERAL(BIGINT_LITERAL, rows[0].at("user_time")) / iv;
@ -249,9 +249,9 @@ bool WatcherRunner::isChildSane(pid_t child) {
state.sustained_latency = 0;
}
// Check the different of CPU time used since last check.
if (state.user_time + getWorkerLimit(UTILIZATION_LIMIT) < user_time ||
state.system_time + getWorkerLimit(UTILIZATION_LIMIT) < system_time) {
// Check the difference of CPU time used since last check.
if (user_time - state.user_time > getWorkerLimit(UTILIZATION_LIMIT) ||
system_time - state.system_time > getWorkerLimit(UTILIZATION_LIMIT)) {
state.sustained_latency++;
} else {
state.sustained_latency = 0;
@ -292,7 +292,6 @@ bool WatcherRunner::isChildSane(pid_t child) {
LOG(WARNING) << "osqueryd worker system performance limits exceeded";
return false;
}
// Check if the private memory exceeds a memory limit.
if (footprint > 0 && footprint > getWorkerLimit(MEMORY_LIMIT) * 1024 * 1024) {
LOG(WARNING) << "osqueryd worker memory limits exceeded: " << footprint;