Skip to content

Account for error.reason === null #228058

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

Merged
gsoldevila merged 4 commits into from
Jul 18, 2025
Merged

Account for error.reason === null #228058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
676205f
Account for error.reason === null
gsoldevila Jul 15, 2025
295a0a9
Address PR feedback
gsoldevila Jul 17, 2025
c30c677
Merge branch 'main' into reason-can-now-be-null
gsoldevila Jul 17, 2025
c2d64fd
Merge branch 'main' into reason-can-now-be-null
gsoldevila Jul 18, 2025
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
10 changes: 5 additions & 5 deletions src/core/packages/root/server-internal/src/bootstrap.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,17 +129,17 @@ export async function bootstrap({ configs, cliArgs, applyConfigOverrides }: Boot
}
}

function onRootShutdown(reason?: any) {
if (reason !== undefined) {
if (reason.code !== MIGRATION_EXCEPTION_CODE) {
function onRootShutdown(error?: any) {
if (error !== undefined) {
if (error.code !== MIGRATION_EXCEPTION_CODE) {
// There is a chance that logger wasn't configured properly and error that
// that forced root to shut down could go unnoticed. To prevent this we always
// mirror such fatal errors in standard output with `console.error`.
// eslint-disable-next-line no-console
console.error(`\n${chalk.white.bgRed(' FATAL ')} ${reason}\n`);
console.error(`\n${chalk.white.bgRed(' FATAL ')} ${error}\n`);
}

process.exit(reason instanceof CriticalError ? reason.processExitCode : 1);
process.exit(error instanceof CriticalError ? error.processExitCode : 1);
}

process.exit(0);
Expand Down
6 changes: 5 additions & 1 deletion src/core/packages/saved-objects/api-server-internal/src/lib/utils/decorate_es_error.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import { get } from 'lodash';
import { errors as esErrors } from '@elastic/elasticsearch';
import type { ErrorCause } from '@elastic/elasticsearch/lib/api/types';
import type { ElasticsearchErrorDetails } from '@kbn/es-errors';
import { isSupportedEsServer } from '@kbn/core-elasticsearch-server-internal';
import { SavedObjectsErrorHelpers } from '@kbn/core-saved-objects-server';
Expand Down Expand Up @@ -38,7 +39,10 @@ export function decorateEsError(error: EsErrors) {
throw new Error('Expected an instance of Error');
}

const { reason } = get(error, 'body.error', { reason: undefined }) as { reason?: string };
const { reason: esErrorReason } = get(error, 'body.error', {
reason: undefined,
}) as ErrorCause;
const reason = esErrorReason || undefined;
if (
error instanceof ConnectionError ||
error instanceof NoLivingConnectionsError ||
Expand Down