You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by lh...@apache.org on 2022/04/14 04:50:07 UTC
[pulsar] branch master updated: Tiered Storage: add OkHttp based provider for JClouds (#15136)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new a74527d3275 Tiered Storage: add OkHttp based provider for JClouds (#15136)
a74527d3275 is described below
commit a74527d32757d309fd9304b3806c5549be8fe534
Author: Enrico Olivelli <eo...@apache.org>
AuthorDate: Thu Apr 14 06:49:58 2022 +0200
Tiered Storage: add OkHttp based provider for JClouds (#15136)
---
jclouds-shaded/pom.xml | 11 +++++++++++
.../java/org/apache/pulsar/jclouds/ShadedJCloudsUtils.java | 10 ++++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/jclouds-shaded/pom.xml b/jclouds-shaded/pom.xml
index bfec207ad2b..a8aa076e791 100644
--- a/jclouds-shaded/pom.xml
+++ b/jclouds-shaded/pom.xml
@@ -45,6 +45,17 @@
<artifactId>jclouds-apachehc</artifactId>
<version>${jclouds.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.driver</groupId>
+ <artifactId>jclouds-okhttp</artifactId>
+ <version>${jclouds.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-slf4j</artifactId>
diff --git a/jclouds-shaded/src/main/java/org/apache/pulsar/jclouds/ShadedJCloudsUtils.java b/jclouds-shaded/src/main/java/org/apache/pulsar/jclouds/ShadedJCloudsUtils.java
index 92209658745..d2c1b0740a8 100644
--- a/jclouds-shaded/src/main/java/org/apache/pulsar/jclouds/ShadedJCloudsUtils.java
+++ b/jclouds-shaded/src/main/java/org/apache/pulsar/jclouds/ShadedJCloudsUtils.java
@@ -23,6 +23,7 @@ import lombok.experimental.UtilityClass;
import lombok.extern.slf4j.Slf4j;
import org.jclouds.ContextBuilder;
import org.jclouds.http.apachehc.config.ApacheHCHttpCommandExecutorServiceModule;
+import org.jclouds.http.okhttp.config.OkHttpCommandExecutorServiceModule;
import org.jclouds.logging.slf4j.config.SLF4JLoggingModule;
import java.util.ArrayList;
@@ -42,9 +43,12 @@ public class ShadedJCloudsUtils {
* Apache Http Client module should work well in all the environments.
*/
private static final boolean ENABLE_APACHE_HC_MODULE = Boolean
- .parseBoolean(System.getProperty("pulsar.jclouds.use_apache_hc", "true"));
+ .parseBoolean(System.getProperty("pulsar.jclouds.use_apache_hc", "false"));
+ private static final boolean ENABLE_OKHTTP_MODULE = Boolean
+ .parseBoolean(System.getProperty("pulsar.jclouds.use_okhttp", "false"));
static {
log.info("Considering -Dpulsar.jclouds.use_apache_hc=" + ENABLE_APACHE_HC_MODULE);
+ log.info("Considering -Dpulsar.jclouds.use_okhttp=" + ENABLE_OKHTTP_MODULE);
}
/**
@@ -54,7 +58,9 @@ public class ShadedJCloudsUtils {
public static void addStandardModules(ContextBuilder builder) {
List<AbstractModule> modules = new ArrayList<>();
modules.add(new SLF4JLoggingModule());
- if (ENABLE_APACHE_HC_MODULE) {
+ if (ENABLE_OKHTTP_MODULE) {
+ modules.add(new OkHttpCommandExecutorServiceModule());
+ } else if (ENABLE_APACHE_HC_MODULE) {
modules.add(new ApacheHCHttpCommandExecutorServiceModule());
}
builder.modules(modules);