functionaltests: restart Integrations Server after ingestion #15356
+532
−58
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This removes the previous implementation with document count checks and the logic that was trying to ensure ingestion was completed. The method now relies only on restarting the APM Server.
|
This pull request does not have a backport label. Could you fix it @endorama? 🙏
|
|
|
mergify
bot
added
the
backport-8.x
marclop
reviewed
Jan 24, 2025
functionaltests/main_test.go
Outdated
Comment on lines
124
to
125
| case "production": | ||
| return "https://api.elastic-cloud.com" |
There was a problem hiding this comment.
Won't this panic?
There was a problem hiding this comment.
yes. I updated it in e528ec5 and also moved to using constants to reduce the chance of this occurring. In parallel I'm discussing how to make this clearer in #14935 (comment)
Use constants to reduce confusion and chance of error when dealing with evaluating the test target environment.
marclop
approved these changes
Jan 24, 2025
mergify bot
pushed a commit
that referenced
this pull request
Jan 24, 2025
* expose deployment id * add ecclient package * restart apm-server after ingest * refactor RunBlockingWait to restart APM Server This removes the previous implementation with document count checks and the logic that was trying to ensure ingestion was completed. The method now relies only on restarting the APM Server. (cherry picked from commit c230240) # Conflicts: # functionaltests/go.sum
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation/summary
This is an alternative #15317.
Instead of expanding the logic to wait for ingestion completion by monitoring data streams and document count, rely on a side effect of shutting down the APM Server. On shutdown APM Server flushes all the data, included the aggregation for the data already ingested.
We use this behaviour triggering a restart of the Integration Server after the test data ingestion is done to ensure ingestion in completed before moving to checking document counts and data streams details.
I run 5 tests and in most cases the restart took ~1 minutes. In 1 case it took 6 and in 1 case it took more than 10 minutes (but the code has a timeout at 10 minutes).
In 1 case the test failed due to race condition when testing that the lazy rollover happened: it did not at the moment of testing but I confirmed manually that it indeed happened. This behaviour suggests lazy rollover may happen later than expected (at ingestion after an upgrade) and is not impacted by this change, but further investigation is required to prevent flakyness.
Checklist
How to test these changes
Functional tests pipeline for this branch should be green: https://github.com/elastic/apm-server/actions/workflows/functional-tests.yml?query=branch%3Afunctionaltests-restartapmserver
Related issues
#14100