Skip to content

Only fetching TaskManager's available tasks once per call to fillPool #61991

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
merged 5 commits into from
Apr 13, 2020
Merged

Only fetching TaskManager's available tasks once per call to fillPool #61991

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
f909e42
Only fetching TaskManager's available tasks once per call to fillPool
kobelb Mar 30, 2020
fb89834
Merge branch 'master' into task-manager/fill-pool-once
elasticmachine Mar 31, 2020
aa26e45
Merge branch 'master' into task-manager/fill-pool-once
elasticmachine Apr 10, 2020
b087184
Merge branch 'master' into task-manager/fill-pool-once
elasticmachine Apr 10, 2020
905c16c
Merge branch 'master' into task-manager/fill-pool-once
elasticmachine Apr 13, 2020
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
4 changes: 2 additions & 2 deletions x-pack/plugins/task_manager/server/lib/fill_pool.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { fillPool } from './fill_pool';
import { TaskPoolRunResult } from '../task_pool';

describe('fillPool', () => {
test('stops filling when there are no more tasks in the store', async () => {
test('stops filling when pool runs all claimed tasks, even if there is more capacity', async () => {
const tasks = [
[1, 2, 3],
[4, 5],
Expand All @@ -22,7 +22,7 @@ describe('fillPool', () => {

await fillPool(fetchAvailableTasks, converter, run);

expect(_.flattenDeep(run.args)).toEqual([1, 2, 3, 4, 5]);
expect(_.flattenDeep(run.args)).toEqual([1, 2, 3]);
});

test('stops filling when the pool has no more capacity', async () => {
Expand Down
49 changes: 22 additions & 27 deletions x-pack/plugins/task_manager/server/lib/fill_pool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
*/

import { performance } from 'perf_hooks';
import { after } from 'lodash';
import { TaskPoolRunResult } from '../task_pool';

export enum FillPoolResult {
NoTasksClaimed = 'NoTasksClaimed',
RanOutOfCapacity = 'RanOutOfCapacity',
PoolFilled = 'PoolFilled',
}

type BatchRun<T> = (tasks: T[]) => Promise<TaskPoolRunResult>;
Expand All @@ -35,33 +35,28 @@ export async function fillPool<TRecord, TRunner>(
run: BatchRun<TRunner>
): Promise<FillPoolResult> {
performance.mark('fillPool.start');
const markClaimedTasksOnRerunCycle = after(2, () =>
performance.mark('fillPool.claimedOnRerunCycle')
);
while (true) {
const instances = await fetchAvailableTasks();
const instances = await fetchAvailableTasks();

if (!instances.length) {
performance.mark('fillPool.bailNoTasks');
performance.measure(
'fillPool.activityDurationUntilNoTasks',
'fillPool.start',
'fillPool.bailNoTasks'
);
return FillPoolResult.NoTasksClaimed;
}
markClaimedTasksOnRerunCycle();
const tasks = instances.map(converter);
if (!instances.length) {
performance.mark('fillPool.bailNoTasks');
performance.measure(
'fillPool.activityDurationUntilNoTasks',
'fillPool.start',
'fillPool.bailNoTasks'
);
return FillPoolResult.NoTasksClaimed;
}
const tasks = instances.map(converter);

if ((await run(tasks)) === TaskPoolRunResult.RanOutOfCapacity) {
performance.mark('fillPool.bailExhaustedCapacity');
performance.measure(
'fillPool.activityDurationUntilExhaustedCapacity',
'fillPool.start',
'fillPool.bailExhaustedCapacity'
);
return FillPoolResult.RanOutOfCapacity;
}
performance.mark('fillPool.cycle');
if ((await run(tasks)) === TaskPoolRunResult.RanOutOfCapacity) {
performance.mark('fillPool.bailExhaustedCapacity');
performance.measure(
'fillPool.activityDurationUntilExhaustedCapacity',
'fillPool.start',
'fillPool.bailExhaustedCapacity'
);
return FillPoolResult.RanOutOfCapacity;
}
performance.mark('fillPool.cycle');
return FillPoolResult.PoolFilled;
}