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

Explicitly set Elasticsearch heap size during CI and local development #86513

Merged
merged 6 commits into from
Dec 18, 2020
Merged

Explicitly set Elasticsearch heap size during CI and local development #86513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
65ffeae
debugging es snapshot memory problems
brianseeders Dec 18, 2020
ba4d3e7
Try a verified snapshot
brianseeders Dec 18, 2020
03c7243
Explicitly set heap size during CI
brianseeders Dec 18, 2020
9060783
Revert Jenkinsfile and set ES_JAVA_OPTS everywhere
brianseeders Dec 18, 2020
4a1139a
Revert verify es snapshot job
brianseeders Dec 18, 2020
0024675
Fix
brianseeders Dec 18, 2020
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
9 changes: 9 additions & 0 deletions packages/kbn-es/src/cluster.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,15 @@ exports.Cluster = class Cluster {

this._log.debug('%s %s', ES_BIN, args.join(' '));

options.esEnvVars = options.esEnvVars || {};

// ES now automatically sets heap size to 50% of the machine's available memory
// so we need to set it to a smaller size for local dev and CI
// especially because we currently run many instances of ES on the same machine during CI
options.esEnvVars.ES_JAVA_OPTS =
(options.esEnvVars.ES_JAVA_OPTS ? `${options.esEnvVars.ES_JAVA_OPTS} ` : '') +
'-Xms1g -Xmx1g';

this._process = execa(ES_BIN, args, {
cwd: installPath,
env: {
Expand Down
2 changes: 1 addition & 1 deletion vars/workers.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ def intake(jobName, String script) {
// Worker for running functional tests. Runs a setup process (e.g. the kibana build) then executes a map of closures in parallel (e.g. one for each ciGroup)
def functional(name, Closure setup, Map processes) {
return {
parallelProcesses(name: name, setup: setup, processes: processes, delayBetweenProcesses: 20, size: 'xl-highmem')
parallelProcesses(name: name, setup: setup, processes: processes, delayBetweenProcesses: 20, size: 'xl')
}
}

Expand Down