Merge branch 'master' into kmg-job-jar-url

Netflix · Sep 12, 2024 · 6ff65a4 · 6ff65a4
2 parents fb3648c + 41eac8e
commit 6ff65a4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/...src/main/java/io/mantisrx/server/master/resourcecluster/ResourceClusterGatewayClient.java b/...src/main/java/io/mantisrx/server/master/resourcecluster/ResourceClusterGatewayClient.java
@@ -128,6 +128,7 @@ private AsyncHttpClient buildCloseableHttpClient(CoreConfiguration configuration
             .setConnectTimeout(configuration.getAsyncHttpClientConnectionTimeoutMs())
             .setRequestTimeout(configuration.getAsyncHttpClientRequestTimeoutMs())
             .setReadTimeout(configuration.getAsyncHttpClientReadTimeoutMs())
+            .setFollowRedirect(configuration.getAsyncHttpClientFollowRedirect())
             .build());
   }
 }
diff --git a/...ne/mantis-control-plane-core/src/main/java/io/mantisrx/server/core/CoreConfiguration.java b/...ne/mantis-control-plane-core/src/main/java/io/mantisrx/server/core/CoreConfiguration.java
@@ -78,6 +78,10 @@ public interface CoreConfiguration {
     @Default("10000")
     int getAsyncHttpClientReadTimeoutMs();
 
+    @Config("mantis.asyncHttpClient.followRedirect")
+    @Default("true")
+    boolean getAsyncHttpClientFollowRedirect();
+
     @Config("mantis.leader.monitor.factory")
     @Default("io.mantisrx.server.core.master.LocalLeaderFactory")
     String getLeaderMonitorFactoryName();

diff --git a/...e-loader/src/main/java/io/mantisrx/runtime/loader/config/WorkerConfigurationWritable.java b/...e-loader/src/main/java/io/mantisrx/runtime/loader/config/WorkerConfigurationWritable.java
@@ -75,6 +75,7 @@ public class WorkerConfigurationWritable implements WorkerConfiguration {
     int asyncHttpClientConnectionTimeoutMs;
     int asyncHttpClientRequestTimeoutMs;
     int asyncHttpClientReadTimeoutMs;
+    boolean asyncHttpClientFollowRedirect;
     String leaderMonitorFactory;
     String metricsCollectorClass;
     String jobAutoscalerManagerClassName;
@@ -130,6 +131,11 @@ public int getMetricsPublisherFrequencyInSeconds() {
         return this.metricsPublisherFrequencyInSeconds;
     }
 
+    @Override
+    public boolean getAsyncHttpClientFollowRedirect() {
+        return this.asyncHttpClientFollowRedirect;
+    }
+
     @Override
     public String getLeaderMonitorFactoryName() {return this.leaderMonitorFactory;}