maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[ci] bump Jenkins worker memory and es JVM size (#111760) (#111784)

Browse source 
Co-authored-by: spalger <spalger@users.noreply.github.com>

Co-authored-by: Spencer <email@spalger.com>
Co-authored-by: spalger <spalger@users.noreply.github.com>
This commit is contained in:
Kibana Machine 2021-09-09 16:46:16 -04:00 committed by GitHub
parent 124f3a7a2e
commit 36fe0bac56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -278,7 +278,8 @@ exports.Cluster = class Cluster {
// especially because we currently run many instances of ES on the same machine during CI
// inital and max must be the same, so we only need to check the max
if (!esJavaOpts.includes('Xmx')) {
esJavaOpts += ' -Xms1g -Xmx1g';
// 1536m === 1.5g
esJavaOpts += ' -Xms1536m -Xmx1536m';
}
this._log.debug('ES_JAVA_OPTS: %s', esJavaOpts.trim());

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

@ -368,7 +368,7 @@ describe('#run()', () => {
const cluster = new Cluster({ log });
await cluster.run();
expect(execa.mock.calls[0][2].env.ES_JAVA_OPTS).toEqual('-Xms1g -Xmx1g');
expect(execa.mock.calls[0][2].env.ES_JAVA_OPTS).toMatchInlineSnapshot(`"-Xms1536m -Xmx1536m"`);
});
it('allows Java heap to be overwritten', async () => {
@ -378,7 +378,7 @@ describe('#run()', () => {
const cluster = new Cluster({ log });
await cluster.run();
expect(execa.mock.calls[0][2].env.ES_JAVA_OPTS).toEqual('-Xms5g -Xmx5g');
expect(execa.mock.calls[0][2].env.ES_JAVA_OPTS).toMatchInlineSnapshot(`"-Xms5g -Xmx5g"`);
});
});

2
vars/workers.groovy
View file

@ -20,7 +20,7 @@ def label(size) {
case 'xl-highmem':
return 'docker && tests-xl-highmem'
case 'xxl':
return 'docker && tests-xxl && gobld/machineType:custom-64-270336'
return 'docker && tests-xxl && gobld/machineType:custom-64-327680'
case 'n2-standard-16':
return 'docker && linux && immutable && gobld/machineType:n2-standard-16'
}