repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor: cleanup queued tasks computation
[poolifier.git]
/
tests
/
pools
/
cluster
/
fixed.test.js
diff --git
a/tests/pools/cluster/fixed.test.js
b/tests/pools/cluster/fixed.test.js
index 494876857665e50fb3a025e212f76221bdd929ab..d0ddcf044cfb711e19aaa75997633c673f764948 100644
(file)
--- a/
tests/pools/cluster/fixed.test.js
+++ b/
tests/pools/cluster/fixed.test.js
@@
-65,11
+65,11
@@
describe('Fixed cluster pool test suite', () => {
let result = await pool.execute({
function: WorkerFunctions.fibonacci
})
let result = await pool.execute({
function: WorkerFunctions.fibonacci
})
- expect(result).toBe(
false
)
+ expect(result).toBe(
121393
)
result = await pool.execute({
function: WorkerFunctions.factorial
})
result = await pool.execute({
function: WorkerFunctions.factorial
})
- expect(result).toBe(
false
)
+ expect(result).toBe(
9.33262154439441e157
)
})
it('Verify that is possible to invoke the execute() method without input', async () => {
})
it('Verify that is possible to invoke the execute() method without input', async () => {
@@
-89,30
+89,35
@@
describe('Fixed cluster pool test suite', () => {
})
it('Verify that tasks queuing is working', async () => {
})
it('Verify that tasks queuing is working', async () => {
- const maxMultiplier = 10
const promises = new Set()
const promises = new Set()
+ const maxMultiplier = 2
for (let i = 0; i < numberOfWorkers * maxMultiplier; i++) {
promises.add(queuePool.execute())
}
expect(promises.size).toBe(numberOfWorkers * maxMultiplier)
for (const workerNode of queuePool.workerNodes) {
for (let i = 0; i < numberOfWorkers * maxMultiplier; i++) {
promises.add(queuePool.execute())
}
expect(promises.size).toBe(numberOfWorkers * maxMultiplier)
for (const workerNode of queuePool.workerNodes) {
- expect(workerNode.
tasksUsage.runn
ing).toBeLessThanOrEqual(
+ expect(workerNode.
workerUsage.tasks.execut
ing).toBeLessThanOrEqual(
queuePool.opts.tasksQueueOptions.concurrency
)
queuePool.opts.tasksQueueOptions.concurrency
)
- expect(workerNode.
tasksUsage.run
).toBe(0)
- expect(workerNode.
tasksQueue.size()
).toBeGreaterThan(0)
+ expect(workerNode.
workerUsage.tasks.executed
).toBe(0)
+ expect(workerNode.
workerUsage.tasks.queued
).toBeGreaterThan(0)
}
}
- expect(queuePool.numberOfRunningTasks).toBe(numberOfWorkers)
- expect(queuePool.numberOfQueuedTasks).toBe(
+ expect(queuePool.info.executingTasks).toBe(numberOfWorkers)
+ expect(queuePool.info.queuedTasks).toBe(
+ numberOfWorkers * maxMultiplier - numberOfWorkers
+ )
+ expect(queuePool.info.maxQueuedTasks).toBe(
numberOfWorkers * maxMultiplier - numberOfWorkers
)
await Promise.all(promises)
for (const workerNode of queuePool.workerNodes) {
numberOfWorkers * maxMultiplier - numberOfWorkers
)
await Promise.all(promises)
for (const workerNode of queuePool.workerNodes) {
- expect(workerNode.tasksUsage.running).toBe(0)
- expect(workerNode.tasksUsage.run).toBeGreaterThan(0)
- expect(workerNode.tasksQueue.size()).toBe(0)
+ expect(workerNode.workerUsage.tasks.executing).toBe(0)
+ expect(workerNode.workerUsage.tasks.executed).toBeGreaterThan(0)
+ expect(workerNode.workerUsage.tasks.executed).toBeLessThanOrEqual(
+ maxMultiplier
+ )
+ expect(workerNode.workerUsage.tasks.queued).toBe(0)
}
}
- promises.clear()
})
it('Verify that is possible to have a worker that return undefined', async () => {
})
it('Verify that is possible to have a worker that return undefined', async () => {
@@
-128,6
+133,10
@@
describe('Fixed cluster pool test suite', () => {
it('Verify that error handling is working properly:sync', async () => {
const data = { f: 10 }
it('Verify that error handling is working properly:sync', async () => {
const data = { f: 10 }
+ let taskError
+ errorPool.emitter.on(PoolEvents.taskError, e => {
+ taskError = e
+ })
let inError
try {
await errorPool.execute(data)
let inError
try {
await errorPool.execute(data)
@@
-137,10
+146,23
@@
describe('Fixed cluster pool test suite', () => {
expect(inError).toBeDefined()
expect(typeof inError === 'string').toBe(true)
expect(inError).toBe('Error Message from ClusterWorker')
expect(inError).toBeDefined()
expect(typeof inError === 'string').toBe(true)
expect(inError).toBe('Error Message from ClusterWorker')
+ expect(taskError).toStrictEqual({
+ message: 'Error Message from ClusterWorker',
+ data
+ })
+ expect(
+ errorPool.workerNodes.some(
+ workerNode => workerNode.workerUsage.tasks.failed === 1
+ )
+ ).toBe(true)
})
it('Verify that error handling is working properly:async', async () => {
const data = { f: 10 }
})
it('Verify that error handling is working properly:async', async () => {
const data = { f: 10 }
+ let taskError
+ asyncErrorPool.emitter.on(PoolEvents.taskError, e => {
+ taskError = e
+ })
let inError
try {
await asyncErrorPool.execute(data)
let inError
try {
await asyncErrorPool.execute(data)
@@
-150,6
+172,15
@@
describe('Fixed cluster pool test suite', () => {
expect(inError).toBeDefined()
expect(typeof inError === 'string').toBe(true)
expect(inError).toBe('Error Message from ClusterWorker:async')
expect(inError).toBeDefined()
expect(typeof inError === 'string').toBe(true)
expect(inError).toBe('Error Message from ClusterWorker:async')
+ expect(taskError).toStrictEqual({
+ message: 'Error Message from ClusterWorker:async',
+ data
+ })
+ expect(
+ asyncErrorPool.workerNodes.some(
+ workerNode => workerNode.workerUsage.tasks.failed === 1
+ )
+ ).toBe(true)
})
it('Verify that async function is working properly', async () => {
})
it('Verify that async function is working properly', async () => {
@@
-162,7
+193,11
@@
describe('Fixed cluster pool test suite', () => {
})
it('Shutdown test', async () => {
})
it('Shutdown test', async () => {
- const exitPromise = TestUtils.waitExits(pool, numberOfWorkers)
+ const exitPromise = TestUtils.waitWorkerEvents(
+ pool,
+ 'exit',
+ numberOfWorkers
+ )
await pool.destroy()
const numberOfExitEvents = await exitPromise
expect(numberOfExitEvents).toBe(numberOfWorkers)
await pool.destroy()
const numberOfExitEvents = await exitPromise
expect(numberOfExitEvents).toBe(numberOfWorkers)