Skip to content

[8.19] Ensure S3Service is STARTED when creating client (#128026) #128027

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
merged 1 commit into from
May 12, 2025
Merged

[8.19] Ensure S3Service is STARTED when creating client (#128026) #128027

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3Service.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.apache.http.conn.DnsResolver;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.store.AlreadyClosedException;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.cluster.coordination.stateless.StoreHeartbeatService;
import org.elasticsearch.cluster.metadata.RepositoryMetadata;
Expand Down Expand Up @@ -177,6 +178,13 @@ public AmazonS3Reference client(RepositoryMetadata repositoryMetadata) {
if (existing != null && existing.tryIncRef()) {
return existing;
}

if (lifecycle.started() == false) {
// doClose() calls releaseCachedClients() which is also synchronized (this) so if we're STARTED here then the client we
// create will definitely not leak on close.
throw new AlreadyClosedException("S3Service is in state [" + lifecycle + "]");
}

final SdkHttpClient httpClient = buildHttpClient(clientSettings, getCustomDnsResolver());
Releasable toRelease = httpClient::close;
try {
Expand Down