Skip to content

Remove cleanup shutdown hook from APMJvmOptions#144420

Merged
jfreden merged 2 commits intoelastic:patch/serverless-fixfrom
mark-vieira:apm-config-file-fix
Mar 18, 2026
Merged

Remove cleanup shutdown hook from APMJvmOptions#144420
jfreden merged 2 commits intoelastic:patch/serverless-fixfrom
mark-vieira:apm-config-file-fix

Conversation

@mark-vieira
Copy link
Copy Markdown
Contributor

After the changes in #143712 the ServerCli is no longer a long-lived process. This means that the shutdown hook here runs before Elasticsearch starts, deleting this configuration file too early. We actually don't need to do this cleanup at all, since ES will delete this file itself during node startup.

@mark-vieira mark-vieira requested a review from a team as a code owner March 17, 2026 16:44
@mark-vieira mark-vieira added >non-issue :Core/Infra/CLI CLI utilities, scripts, and infrastructure labels Mar 17, 2026
@elasticsearchmachine elasticsearchmachine added v9.4.0 Team:Core/Infra Meta label for core/infra team labels Mar 17, 2026
@elasticsearchmachine
Copy link
Copy Markdown
Collaborator

Pinging @elastic/es-core-infra (Team:Core/Infra)

Copy link
Copy Markdown
Contributor

@mosche mosche left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@mark-vieira mark-vieira changed the base branch from main to patch/serverless-fix March 17, 2026 17:12
@mark-vieira mark-vieira requested review from a team as code owners March 17, 2026 17:12
@mark-vieira mark-vieira force-pushed the apm-config-file-fix branch from 9587ba4 to 22642db Compare March 17, 2026 18:22
@prdoyle
Copy link
Copy Markdown
Contributor

prdoyle commented Mar 17, 2026

The serverless checks are failing due to production-canary. Is that related to the fact that production-canary is currently locked? Or is it a coincidence?

@jfreden
Copy link
Copy Markdown
Contributor

jfreden commented Mar 18, 2026

The pending validate-transport-version-backport check has completed and passed. Will merge.

@jfreden jfreden merged commit 6e3d642 into elastic:patch/serverless-fix Mar 18, 2026
36 of 37 checks passed
JVerwolf pushed a commit to JVerwolf/elasticsearch that referenced this pull request Mar 18, 2026
michalborek pushed a commit to michalborek/elasticsearch that referenced this pull request Mar 23, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

:Core/Infra/CLI CLI utilities, scripts, and infrastructure >non-issue Team:Core/Infra Meta label for core/infra team v9.4.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants