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

Record failed jobs when saving the result fails (dont retry) #28629

Merged
merged 9 commits into from
Jan 23, 2019
Merged

Record failed jobs when saving the result fails (dont retry) #28629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f828021
Record failed jobs when saving the result fails (dont retry)
Jan 11, 2019
98d7f51
Adding a test for the catch on ES save failiure
Jan 15, 2019
e91efb1
Merge remote-tracking branch 'upstream/master' into reporting/log-es-…
Jan 17, 2019
11a2410
Merge remote-tracking branch 'upstream/master' into reporting/log-es-…
Jan 18, 2019
99cd3ad
Merge remote-tracking branch 'upstream/master' into reporting/log-es-…
Jan 22, 2019
8b7dfe3
Seeing if this is causing jenkins to hang
Jan 22, 2019
d5d5a5e
Maybe this is hanging?
Jan 22, 2019
c493231
Returning _failJob results
Jan 23, 2019
661de88
Destroy the worker on end
Jan 23, 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
27 changes: 27 additions & 0 deletions x-pack/plugins/reporting/server/lib/esqueue/__tests__/worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,6 +867,33 @@ describe('Worker class', function () {
return sinon.stub(workerWithFailure, '_failJob').returns(Promise.resolve());
}

describe('saving output failure', () => {
it('should mark the job as failed if saving to ES fails', async () => {
const job = {
_id: 'shouldSucced',
_source: {
timeout: 1000,
payload: 'test'
}
};

sinon.stub(mockQueue.client, 'update').returns(Promise.reject({ statusCode: 413 }));

const workerFn = function (jobPayload) {
return new Promise(function (resolve) {
setTimeout(() => resolve(jobPayload), 10);
});
};
const worker = new Worker(mockQueue, 'test', workerFn, defaultWorkerOptions);
const failStub = getFailStub(worker);

await worker._performJob(job);
worker.destroy();
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this was the missing piece.


sinon.assert.called(failStub);
});
});

describe('search failure', function () {
it('causes _processPendingJobs to reject the Promise', function () {
sinon.stub(mockQueue.client, 'search').returns(Promise.reject(new Error('test error')));
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/reporting/server/lib/esqueue/worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ export class Worker extends events.EventEmitter {
if (err.statusCode === 409) return false;
this.warn(`Failure saving job output ${job._id}`, err);
this.emit(constants.EVENT_WORKER_JOB_UPDATE_ERROR, this._formatErrorParams(err, job));
return this._failJob(job, (err.message) ? err.message : false);
});
}, (jobErr) => {
if (!jobErr) {
Expand Down