Skip to content
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

Jump to bottom

[3.0] Fix autobalancer #651

Merged
merged 5 commits into from
Aug 20, 2019
Merged

[3.0] Fix autobalancer #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dcebc1e
Fixed #622, added a return statement when timeToClearPerQueue = 0, to…
SDekkers Aug 7, 2019
095e7b8
Updated tests to reflect new behavior defaulting to the min amount of…
SDekkers Aug 7, 2019
db4a399
Added test to verify amount of processes goes up for busy queue
SDekkers Aug 7, 2019
c94e265
Updated AutoScaler::numberOfWorkersPerQueue() to not use ternary stat…
SDekkers Aug 20, 2019
2b50886
Removing empty lines for StyleCI
SDekkers Aug 20, 2019
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
12 changes: 9 additions & 3 deletions src/AutoScaler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,15 @@ protected function numberOfWorkersPerQueue(Supervisor $supervisor, Collection $t
$timeToClearAll = $timeToClear->sum();

return $timeToClear->mapWithKeys(function ($timeToClear, $queue) use ($supervisor, $timeToClearAll) {
return $timeToClearAll > 0 && $supervisor->options->autoScaling()
? [$queue => (($timeToClear / $timeToClearAll) * $supervisor->options->maxProcesses)]
: [$queue => $supervisor->options->maxProcesses / count($supervisor->processPools)];
if ($timeToClearAll > 0 &&
$supervisor->options->autoScaling()) {
return [$queue => (($timeToClear / $timeToClearAll) * $supervisor->options->maxProcesses)];
} elseif ($timeToClearAll == 0 &&
$supervisor->options->autoScaling()) {
return [$queue => $supervisor->options->minProcesses];
}

return [$queue => $supervisor->options->maxProcesses / count($supervisor->processPools)];
})->sort();
}

Expand Down
56 changes: 52 additions & 4 deletions tests/Feature/AutoScalerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,66 @@ public function test_balance_stays_even_when_queue_is_empty()

$scaler->scale($supervisor);

$this->assertEquals(4, $supervisor->processPools['first']->totalProcessCount());
$this->assertEquals(4, $supervisor->processPools['second']->totalProcessCount());

$scaler->scale($supervisor);

$this->assertEquals(3, $supervisor->processPools['first']->totalProcessCount());
$this->assertEquals(3, $supervisor->processPools['second']->totalProcessCount());

$scaler->scale($supervisor);

$this->assertEquals(2, $supervisor->processPools['first']->totalProcessCount());
$this->assertEquals(2, $supervisor->processPools['second']->totalProcessCount());

$scaler->scale($supervisor);

$this->assertEquals(1, $supervisor->processPools['first']->totalProcessCount());
$this->assertEquals(1, $supervisor->processPools['second']->totalProcessCount());
}

public function test_balancer_assigns_more_processes_on_busy_queue()
{
[$scaler, $supervisor] = $this->with_scaling_scenario(10, [
'first' => ['current' => 1, 'size' => 50, 'runtime' => 50],
'second' => ['current' => 1, 'size' => 0, 'runtime' => 0],
]);

$scaler->scale($supervisor);
$scaler->scale($supervisor);

$this->assertEquals(3, $supervisor->processPools['first']->totalProcessCount());
$this->assertEquals(1, $supervisor->processPools['second']->totalProcessCount());

$scaler->scale($supervisor);
$scaler->scale($supervisor);

$this->assertEquals(5, $supervisor->processPools['first']->totalProcessCount());
$this->assertEquals(5, $supervisor->processPools['second']->totalProcessCount());
$this->assertEquals(1, $supervisor->processPools['second']->totalProcessCount());

$scaler->scale($supervisor);
$scaler->scale($supervisor);

$this->assertEquals(7, $supervisor->processPools['first']->totalProcessCount());
$this->assertEquals(1, $supervisor->processPools['second']->totalProcessCount());

$scaler->scale($supervisor);
$scaler->scale($supervisor);
$scaler->scale($supervisor);

$this->assertEquals(9, $supervisor->processPools['first']->totalProcessCount());
$this->assertEquals(1, $supervisor->processPools['second']->totalProcessCount());
}

public function test_balancing_a_single_queue_assigns_it_the_max_workers()
public function test_balancing_a_single_queue_assigns_it_the_min_workers_with_empty_queue()
{
[$scaler, $supervisor] = $this->with_scaling_scenario(5, [
'first' => ['current' => 4, 'size' => 0, 'runtime' => 0],
'first' => ['current' => 2, 'size' => 0, 'runtime' => 0],
]);

$scaler->scale($supervisor);
$this->assertEquals(5, $supervisor->processPools['first']->totalProcessCount());
$this->assertEquals(1, $supervisor->processPools['first']->totalProcessCount());
}

public function test_scaler_will_not_scale_past_max_process_threshold_under_high_load()
Expand Down