Skip to content
This repository has been archived by the owner on Mar 31, 2024. It is now read-only.

Commit

Permalink
[es/healthcheck] ensure that healthcheck stops when server is stopped (
Browse files Browse the repository at this point in the history
…elastic#13201)

(cherry picked from commit 9245488)
  • Loading branch information
spalger committed Aug 8, 2017
1 parent 293a444 commit fe20c29
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 5 deletions.
37 changes: 32 additions & 5 deletions src/core_plugins/elasticsearch/lib/__tests__/health_check.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,17 @@ describe('plugins/elasticsearch', () => {
let plugin;
let cluster;
let server;
const sandbox = sinon.sandbox.create();

function getTimerCount() {
return Object.keys(sandbox.clock.timers || {}).length;
}

beforeEach(() => {
const COMPATIBLE_VERSION_NUMBER = '5.0.0';

// Stub the Kibana version instead of drawing from package.json.
sinon.stub(kibanaVersion, 'get').returns(COMPATIBLE_VERSION_NUMBER);
sandbox.stub(kibanaVersion, 'get').returns(COMPATIBLE_VERSION_NUMBER);

// setup the plugin stub
plugin = {
Expand All @@ -55,7 +60,7 @@ describe('plugins/elasticsearch', () => {
}
}));

sinon.stub(determineEnabledScriptingLangsNS, 'determineEnabledScriptingLangs').returns(Promise.resolve([]));
sandbox.stub(determineEnabledScriptingLangsNS, 'determineEnabledScriptingLangs').returns(Promise.resolve([]));

// setup the config().get()/.set() stubs
const get = sinon.stub();
Expand All @@ -74,15 +79,37 @@ describe('plugins/elasticsearch', () => {
elasticsearch: {
getCluster: sinon.stub().returns(cluster)
}
}
},
ext: sinon.stub()
};

health = healthCheck(plugin, server, { mappings });
});

afterEach(() => {
kibanaVersion.get.restore();
determineEnabledScriptingLangs.restore();
sandbox.restore();
});

it('should stop when cluster is shutdown', () => {
sandbox.useFakeTimers();

// ensure that health.start() is responsible for the timer we are observing
expect(getTimerCount()).to.be(0);
health.start();
expect(getTimerCount()).to.be(1);

// ensure that a server extension was registered
sinon.assert.calledOnce(server.ext);
sinon.assert.calledWithExactly(server.ext, sinon.match.string, sinon.match.func);

// call the server extension
const reply = sinon.stub();
const [,handler] = server.ext.firstCall.args;
handler({}, reply);

// ensure that the handler called reply and unregistered the time
sinon.assert.calledOnce(reply);
expect(getTimerCount()).to.be(0);
});

it('should set the cluster green if everything is ready', function () {
Expand Down
5 changes: 5 additions & 0 deletions src/core_plugins/elasticsearch/lib/health_check.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,11 @@ module.exports = function (plugin, server, { mappings }) {
return true;
}

server.ext('onPreStop', (request, reply) => {
stopChecking();
reply();
});

return {
waitUntilReady: waitUntilReady,
run: check,
Expand Down

0 comments on commit fe20c29

Please sign in to comment.