github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

[kbn/es] start es with raised indices.query.bool.max_nested_depth

Browse source 
(cherry picked from commit e914a60ba8c335a187e8a269596e5072ed4502ee)
This commit is contained in:
spalger 2021-01-13 17:58:19 -07:00
parent 03bc632204
commit 28beb60d79
2 changed files with 36 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
packages/kbn-es/src/cluster.js
View file

@ -257,8 +257,9 @@ exports.Cluster = class Cluster {
this._log.info(chalk.bold('Starting')); this._log.info(chalk.bold('Starting'));
this._log.indent(4); this._log.indent(4);
const esArgs = ['indices.query.bool.max_nested_depth=100'].concat(options.esArgs || []);
// Add to esArgs if ssl is enabled // Add to esArgs if ssl is enabled
const esArgs = [].concat(options.esArgs || []);
if (this._ssl) { if (this._ssl) {
esArgs.push('xpack.security.http.ssl.enabled=true'); esArgs.push('xpack.security.http.ssl.enabled=true');
esArgs.push(`xpack.security.http.ssl.keystore.path=${ES_P12_PATH}`); esArgs.push(`xpack.security.http.ssl.keystore.path=${ES_P12_PATH}`);

39
packages/kbn-es/src/integration_tests/cluster.test.js
View file

@ -17,12 +17,19 @@
* under the License. * under the License.
*/ */
const { ToolingLog, ES_P12_PATH, ES_P12_PASSWORD } = require('@kbn/dev-utils'); const {
ToolingLog,
ES_P12_PATH,
ES_P12_PASSWORD,
createAnyInstanceSerializer,
} = require('@kbn/dev-utils');
const execa = require('execa'); const execa = require('execa');
const { Cluster } = require('../cluster'); const { Cluster } = require('../cluster');
const { installSource, installSnapshot, installArchive } = require('../install'); const { installSource, installSnapshot, installArchive } = require('../install');
const { extractConfigFiles } = require('../utils/extract_config_files'); const { extractConfigFiles } = require('../utils/extract_config_files');
expect.addSnapshotSerializer(createAnyInstanceSerializer(ToolingLog));
jest.mock('../install', () => ({ jest.mock('../install', () => ({
installSource: jest.fn(), installSource: jest.fn(),
installSnapshot: jest.fn(), installSnapshot: jest.fn(),
@ -265,8 +272,19 @@ describe('#start(installPath)', () => {
const cluster = new Cluster({ log, ssl: false }); const cluster = new Cluster({ log, ssl: false });
await cluster.start(); await cluster.start();
const config = extractConfigFiles.mock.calls[0][0]; expect(extractConfigFiles.mock.calls).toMatchInlineSnapshot(`
expect(config).toHaveLength(0); Array [
Array [
Array [
"indices.query.bool.max_nested_depth=100",
],
undefined,
Object {
"log": <ToolingLog>,
},
],
]
`);
}); });
}); });
@ -332,8 +350,19 @@ describe('#run()', () => {
const cluster = new Cluster({ log, ssl: false }); const cluster = new Cluster({ log, ssl: false });
await cluster.run(); await cluster.run();
const config = extractConfigFiles.mock.calls[0][0]; expect(extractConfigFiles.mock.calls).toMatchInlineSnapshot(`
expect(config).toHaveLength(0); Array [
Array [
Array [
"indices.query.bool.max_nested_depth=100",
],
undefined,
Object {
"log": <ToolingLog>,
},
],
]
`);
}); });
}); });