Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

some stuff

This commit is contained in:
Zoltan Haindrich 2024-05-21 12:02:44 +00:00
parent e7e119b559
commit 52598d3bca
5 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3StorageDruidModule.java
View File

@ -24,6 +24,7 @@ import com.amazonaws.ClientConfigurationFactory;
import com.amazonaws.Protocol; import com.amazonaws.Protocol;
import com.amazonaws.auth.AWSCredentialsProvider; import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration; import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
import com.amazonaws.regions.Regions;
import com.amazonaws.services.s3.AmazonS3Client; import com.amazonaws.services.s3.AmazonS3Client;
import com.amazonaws.services.s3.AmazonS3ClientBuilder; import com.amazonaws.services.s3.AmazonS3ClientBuilder;
import com.fasterxml.jackson.core.Version; import com.fasterxml.jackson.core.Version;
@ -141,8 +142,10 @@ public class S3StorageDruidModule implements DruidModule
.withClientConfiguration(S3Utils.setProxyConfig(configuration, proxyConfig).withProtocol(protocol)) .withClientConfiguration(S3Utils.setProxyConfig(configuration, proxyConfig).withProtocol(protocol))
.withChunkedEncodingDisabled(clientConfig.isDisableChunkedEncoding()) .withChunkedEncodingDisabled(clientConfig.isDisableChunkedEncoding())
.withPathStyleAccessEnabled(clientConfig.isEnablePathStyleAccess()) .withPathStyleAccessEnabled(clientConfig.isEnablePathStyleAccess())
.withRegion(Regions.US_WEST_2)
.withForceGlobalBucketAccessEnabled(clientConfig.isForceGlobalBucketAccessEnabled()); .withForceGlobalBucketAccessEnabled(clientConfig.isForceGlobalBucketAccessEnabled());
if (StringUtils.isNotEmpty(endpointConfig.getUrl())) { if (StringUtils.isNotEmpty(endpointConfig.getUrl())) {
amazonS3ClientBuilder.setEndpointConfiguration( amazonS3ClientBuilder.setEndpointConfiguration(
new EndpointConfiguration(endpointConfig.getUrl(), endpointConfig.getSigningRegion()) new EndpointConfiguration(endpointConfig.getUrl(), endpointConfig.getSigningRegion())

1
integration-tests/src/main/java/org/apache/druid/quidem/DiscovertModule.java
View File

@ -51,6 +51,7 @@ public class DiscovertModule extends AbstractModule {
return null; return null;
} }
@Provides @Provides
@LazySingleton @LazySingleton
public Properties getProps() { public Properties getProps() {

3
integration-tests/src/main/java/org/apache/druid/quidem/Launcher.java
View File

@ -99,7 +99,8 @@ public class Launcher
chk1(); chk1();
chkStatus(); chkStatus();
lifecycle.stop(); lifecycle.join();
// lifecycle.stop();
} else { } else {
} }

1
integration-tests/src/main/java/org/apache/druid/quidem/QuidemCaptureModule.java
View File

@ -30,5 +30,6 @@ public class QuidemCaptureModule implements Module
public void configure(Binder binder) public void configure(Binder binder)
{ {
Jerseys.addResource(binder, QuidemCapture.class); Jerseys.addResource(binder, QuidemCapture.class);
// Hook.CONVERTED.add(null)
} }
} }