Skip to content

Conversation

@ericywl
Copy link
Contributor

@ericywl ericywl commented Jun 12, 2025

Motivation/summary

Due to changes to apm-data introduced in elastic/elasticsearch#128913, 8.19 and 9.1 no longer share the same templates. As a result, when upgrading from 8.19 to 9.1, there will be index lazy-rollover on ingest.

This PR fixes the failure caused by the above, and also update notify step to fire on main branch only.

It seems the failures is simply due to the apm-data change not being backported to 8.19 yet. I have reverted the relevant changes here, but left the PR up since there are some good changes.

@ericywl ericywl self-assigned this Jun 12, 2025
@ericywl ericywl requested a review from a team as a code owner June 12, 2025 06:40
@ericywl ericywl added the backport-skip Skip notification from the automated backport with mergify label Jun 12, 2025
@github-actions
Copy link
Contributor

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

endorama
endorama previously approved these changes Jun 12, 2025
Copy link
Contributor

@endorama endorama left a comment

Choose a reason for hiding this comment

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

Thank you!

@endorama
Copy link
Contributor

Just noted your test run failed. Tests that failed where:

Both errors don't seem related to this change. Worth retrying them before merging.

@ericywl
Copy link
Contributor Author

ericywl commented Jun 12, 2025

Made some last minute changes, will rerun the test again.

@ericywl ericywl requested review from a team and endorama June 12, 2025 07:28
@carsonip
Copy link
Member

fyi the change in elastic/elasticsearch#128913 is going to be backported to 8.19. This means you should expect a change in template between "8.18 and 8.19" and "9.0 and 9.1"

@ericywl
Copy link
Contributor Author

ericywl commented Jun 12, 2025

Thanks for the heads up. I will revert the changes then.

})

scrollSearchQueryContextCanceled = apmErrorLog(types.Query{
MatchPhrase: map[string]types.MatchPhraseQuery{
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we think of excluding all "context canceled" logs that we observe? I expect there are multiple occasions where this happens on shutdown and filtering them one by one manually seems to require a lot of manual intervention. This is for a follow-up, worth a separate issue.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yup, "context canceled" (and maybe even "context deadline exceeded") could be excluded in a follow up.

@ericywl ericywl changed the title integration-server-test: Fix 9.1 test failure due to apm-data changes integration-server-test: Don't notify if not run from main Jun 12, 2025
Copy link
Contributor

@endorama endorama left a comment

Choose a reason for hiding this comment

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

@ericywl I would have preferred if you closed this PR instead of renaming it with a complete different scope, this may create some confusion (think already sent notifications/emails).

Said that let's merge this, the change to the notification is great!

I'd need you to clarify if with the last comment from Carson you reverted the changes because not relevant or because you plan to introduce them in another PR. My understanding is that with the template change there would be a rollover in 8.19, but maybe this already happens so it's already covered?

@ericywl
Copy link
Contributor Author

ericywl commented Jun 12, 2025

I would have preferred if you closed this PR instead of renaming it with a complete different scope, this may create some confusion (think already sent notifications/emails).

Got it, will take not for future PRs.

I'd need you to clarify if with the last comment from Carson you reverted the changes because not relevant or because you plan to introduce them in another PR. My understanding is that with the template change there would be a rollover in 8.19, but maybe this already happens so it's already covered?

Once the apm-data changes get backported to 8.19, both 8.19 and 9.1 will have the same templates (which is our existing assumption), so no change needed.

@ericywl ericywl enabled auto-merge (squash) June 13, 2025 02:47
@ericywl ericywl merged commit 8341b0a into main Jun 13, 2025
17 checks passed
@ericywl ericywl deleted the integration-server-test-apm-data-change branch June 13, 2025 02:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-skip Skip notification from the automated backport with mergify

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants