migrations: deflake data_migrations_api_test#28325
Merged
joe-redpanda merged 1 commit intoredpanda-data:devfrom Dec 4, 2025
Merged
migrations: deflake data_migrations_api_test#28325joe-redpanda merged 1 commit intoredpanda-data:devfrom
joe-redpanda merged 1 commit intoredpanda-data:devfrom
Conversation
joe-redpanda
changed the title
Contributor
Author
|
/ci-repeat 1 |
Collaborator
CI test resultstest results on build#75513
test results on build#75613
test results on build#76177
test results on build#76685
test results on build#77205
|
joe-redpanda
requested review from
bashtanov,
bharathv,
Copilot and
mmaslankaprv
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR fixes flakiness in the data_migrations_api_test by improving error handling and shutdown behavior in the data migrations API. The changes ensure that sleep aborted exceptions during shutdown are properly caught and converted to appropriate HTTP errors, and that HTTP requests don't hang during shutdown.
Key Changes:
- Added error handling for
sleep_abortedexceptions inlist_migrations()to map them tocluster::errc::shutting_down - Updated
list_migrations()return type to include error handling viaresult<>wrapper - Modified admin server endpoint to handle errors from
list_migrations()and convert them to proper HTTP responses
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/v/cluster/data_migration_frontend.h | Changed list_migrations() return type to include error result wrapper |
| src/v/cluster/data_migration_frontend.cc | Added try-catch for sleep_aborted exception and converted to error result |
| src/v/redpanda/admin/migrations.cc | Added error handling in admin endpoint to process errors from list_migrations() |
joe-redpanda
force-pushed
the
migration_error_mapping
branch
from
0d38bce to
da1bdf6
Compare
Contributor
Author
|
Rebase atop Michal's changes |
Contributor
Author
|
Not sure how the "stop" change fell off in the rebase, readded and testing |
joe-redpanda
force-pushed
the
migration_error_mapping
branch
from
50b2052 to
f2ca443
Compare
Contributor
Author
|
no changes, rebased onto dev to reduce my build times |
Contributor
|
As far as I understand router needs to be requested to stop early, in controller shutdown input. That's for Admin API to be able to stop. See #28491 |
Contributor
Author
makes sense, left a comment. Should we still have a stop that awaits the completion of the shutdown of the contained routers? |
joe-redpanda
force-pushed
the
migration_error_mapping
branch
from
f2ca443 to
6d41416
Compare
joe-redpanda
force-pushed
the
migration_error_mapping
branch
from
6d41416 to
4242b7b
Compare
Invoke on instance can fail on shutdown with a sleep_aborted exception. Catch the exception and translate to an errc::shutting_down code such that the admin server can handle it correctly by changing it into a service unavailable response.
joe-redpanda
force-pushed
the
migration_error_mapping
branch
from
4242b7b to
28f67e4
Compare
bharathv
reviewed
Dec 3, 2025
| co_return cluster::errc::shutting_down; | ||
| } | ||
| vlog(dm_log.error, "unexpected exception on list_migrations {}", eptr); | ||
| throw; |
Contributor
Author
There was a problem hiding this comment.
Throw with no expression just rethrows the current exception
Am I missing something?
Contributor
There was a problem hiding this comment.
was a nitpick, I thought since eptr was already captured in a local variable, we may aswell just rethrow that.
bharathv
approved these changes
Dec 4, 2025
| co_return cluster::errc::shutting_down; | ||
| } | ||
| vlog(dm_log.error, "unexpected exception on list_migrations {}", eptr); | ||
| throw; |
Contributor
There was a problem hiding this comment.
was a nitpick, I thought since eptr was already captured in a local variable, we may aswell just rethrow that.
Collaborator
|
/backport v25.3.x |
This file contains hidden or 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
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.
Myriad fixes for data_migration_api_test.
Backports Required
Release Notes
Improvements