Skip to content

Commit

Permalink
CCS Fail Test Mode (#125997)
Browse files Browse the repository at this point in the history
* Added the search.check_ccs_compatibility flag

* Moved up the level on the logging statements for ES Args so we can debug locally.

* Updated snapshots to reflect new flag that was added.
  • Loading branch information
cuff-links authored Feb 24, 2022
1 parent 4e238ec commit 68ab355
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 3 additions & 2 deletions packages/kbn-es/src/cluster.js
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ exports.Cluster = class Cluster {
const esArgs = [
'action.destructive_requires_name=true',
'ingest.geoip.downloader.enabled=false',
'search.check_ccs_compatibility=true',
].concat(options.esArgs || []);

// Add to esArgs if ssl is enabled
Expand All @@ -274,7 +275,7 @@ exports.Cluster = class Cluster {
[]
);

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

let esJavaOpts = `${options.esJavaOpts || ''} ${process.env.ES_JAVA_OPTS || ''}`;

Expand All @@ -287,7 +288,7 @@ exports.Cluster = class Cluster {
esJavaOpts += ' -Xms1536m -Xmx1536m';
}

this._log.debug('ES_JAVA_OPTS: %s', esJavaOpts.trim());
this._log.info('ES_JAVA_OPTS: %s', esJavaOpts.trim());

this._process = execa(ES_BIN, args, {
cwd: installPath,
Expand Down
2 changes: 2 additions & 0 deletions packages/kbn-es/src/integration_tests/cluster.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ describe('#start(installPath)', () => {
Array [
"action.destructive_requires_name=true",
"ingest.geoip.downloader.enabled=false",
"search.check_ccs_compatibility=true",
],
undefined,
Object {
Expand Down Expand Up @@ -387,6 +388,7 @@ describe('#run()', () => {
Array [
"action.destructive_requires_name=true",
"ingest.geoip.downloader.enabled=false",
"search.check_ccs_compatibility=true",
],
undefined,
Object {
Expand Down

0 comments on commit 68ab355

Please sign in to comment.