Skip to content

Antalya 25.8: Fix for opt-in AWS S3 regions when no explicit region is specified #1101

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
zvonand merged 3 commits into from
Oct 24, 2025
Merged

Antalya 25.8: Fix for opt-in AWS S3 regions when no explicit region is specified #1101

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c61e22c
handle opt-in regions properly
zvonand Oct 23, 2025
1673d72
tiny fix
zvonand Oct 23, 2025
280d421
small improvements
zvonand Oct 23, 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
19 changes: 17 additions & 2 deletions src/IO/S3/Client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,19 +703,34 @@ Client::doRequest(RequestType & request, RequestFn request_fn) const
continue;
}

if (error.GetResponseCode() != Aws::Http::HttpResponseCode::MOVED_PERMANENTLY)
/// IllegalLocationConstraintException may indicate that we are working with an opt-in region (e.g. me-south-1)
/// In that case, we need to update the region and try again
if (error.GetResponseCode() != Aws::Http::HttpResponseCode::MOVED_PERMANENTLY && error.GetExceptionName() != "IllegalLocationConstraintException")
return result;

// maybe we detect a correct region
if (!detect_region)
bool new_region_detected = false;
if (!detect_region || error.GetExceptionName() == "IllegalLocationConstraintException")
{
if (auto region = GetErrorMarshaller()->ExtractRegion(error); !region.empty() && region != explicit_region)
{
LOG_INFO(log, "Detected new region: {}", region);
request.overrideRegion(region);
insertRegionOverride(bucket, region);
new_region_detected = true;
}
}

/// special handling for opt-in regions
if (new_region_detected && error.GetExceptionName() == "IllegalLocationConstraintException" && initial_endpoint.substr(11) == "amazonaws.com")
{
S3::URI new_uri(initial_endpoint);
new_uri.addRegionToURI(request.getRegionOverride());
found_new_endpoint = true;
request.overrideURI(new_uri);
continue;
}

// we possibly got new location, need to try with that one
auto new_uri = getURIFromError(error);
if (!new_uri)
Expand Down
Loading