Skip to content

feat: add workermaxmemory option #7

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.

Sign up for GitHub

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

Merged
xrompdev merged 1 commit into from
May 20, 2025
Merged

feat: add workermaxmemory option #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 55 additions & 0 deletions Console/Command/QueueShell.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,26 @@ public function runworker() {
if ($this->QueuedTask->exit === true) {
$this->_exit = true;
} else {
// check if we are over the memory limit and end processing if so
$memoryLimit = Configure::read('Queue.workermaxmemory');
$workerMaxMemoryTimeout = Configure::read('Queue.workermaxmemorytimeout');
if ($memoryLimit) {
$memoryUsage = $this->_humanReadableBytes(memory_get_usage(true));
$this->out('Memory usage: ' . $memoryUsage);
if ($memoryUsage >= $memoryLimit) {
$this->out('Reached memory limit of ' . $memoryUsage . ' (Max ' . $memoryLimit . 'MB), skipping this job.');
// Mark job as failed due to memory constraints
$this->QueuedTask->markJobFailed($data['id'], 'Not enough memory to run this job. Worker memory usage hit ' . $memoryUsage . 'MB, over the ' . $memoryLimit . 'MB max limit.');
if ($workerMaxMemoryTimeout) {
$this->out('Exiting in ' . $workerMaxMemoryTimeout . ' seconds due to memory limit.');
sleep($workerMaxMemoryTimeout);
$this->_exit = true;
}
sleep(Configure::read('Queue.sleeptime'));
$this->hr();
continue;
}
}
if ($data) {
$this->out('Running Job of type "' . $data['jobtype'] . '"');
$taskname = 'Queue' . $data['jobtype'];
Expand Down Expand Up @@ -333,6 +353,26 @@ public function runworkersqs() {
if ($this->QueuedTask->exit === true) {
$this->_exit = true;
} else {
// check if we are over the memory limit and end processing if so
$memoryLimit = Configure::read('Queue.workermaxmemory');
$workerMaxMemoryTimeout = Configure::read('Queue.workermaxmemorytimeout');
if ($memoryLimit) {
$memoryUsage = $this->_humanReadableBytes(memory_get_usage(true));
$this->out('Memory usage: ' . $memoryUsage);
if ($memoryUsage >= $memoryLimit) {
$this->out('Reached memory limit of ' . $memoryUsage . ' (Max ' . $memoryLimit . 'MB), skipping this job.');
// Mark job as failed due to memory constraints
$this->QueuedTask->markJobFailed($data['id'], 'Not enough memory to run this job. Worker memory usage hit ' . $memoryUsage . 'MB, over the ' . $memoryLimit . 'MB max limit.');
if ($workerMaxMemoryTimeout) {
$this->out('Exiting in ' . $workerMaxMemoryTimeout . ' seconds due to memory limit.');
sleep($workerMaxMemoryTimeout);
$this->_exit = true;
}
sleep(Configure::read('Queue.sleeptime'));
$this->hr();
continue;
}
}
if ($data) {
$this->out('Running Job of type "' . $data['jobtype'] . '"');
$taskname = 'Queue' . $data['jobtype'];
Expand Down Expand Up @@ -621,4 +661,19 @@ public function __destruct() {
}
}

/**
* Format bytes into human readable format
*
* @param int $bytes Number of bytes
* @return string Human readable bytes format
*/
protected function _humanReadableBytes($bytes) {
$units = ['B', 'KB', 'MB', 'GB', 'TB'];
$bytes = max($bytes, 0);
$pow = floor(($bytes ? log($bytes) : 0) / log(1024));
$pow = min($pow, count($units) - 1);
$bytes /= pow(1024, $pow);
return round($bytes, 2) . ' ' . $units[$pow];
}

}