Remove defunct exchange.min-error-duration configuration

The configuration `exchange.min-error-duration` is ignored since c4092b0 removed the `QueryManagerConfig.remoteTaskMinErrorDuration` field.
trinodb · Jun 2, 2023 · e9181f3 · e9181f3
1 parent 8fbb400
commit e9181f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/operator/DirectExchangeClientConfig.java b/core/trino-main/src/main/java/io/trino/operator/DirectExchangeClientConfig.java
@@ -14,6 +14,7 @@
 package io.trino.operator;
 
 import io.airlift.configuration.Config;
+import io.airlift.configuration.DefunctConfig;
 import io.airlift.http.client.HttpClientConfig;
 import io.airlift.units.DataSize;
 import io.airlift.units.DataSize.Unit;
@@ -26,6 +27,7 @@
 
 import java.util.concurrent.TimeUnit;
 
+@DefunctConfig("exchange.min-error-duration")
 public class DirectExchangeClientConfig
 {
     private DataSize maxBufferSize = DataSize.of(32, Unit.MEGABYTE);
@@ -63,19 +65,6 @@ public DirectExchangeClientConfig setConcurrentRequestMultiplier(int concurrentR
         return this;
     }
 
-    @Deprecated
-    public Duration getMinErrorDuration()
-    {
-        return maxErrorDuration;
-    }
-
-    @Deprecated
-    @Config("exchange.min-error-duration")
-    public DirectExchangeClientConfig setMinErrorDuration(Duration minErrorDuration)
-    {
-        return this;
-    }
-
     @NotNull
     @MinDuration("1ms")
     public Duration getMaxErrorDuration()

diff --git a/core/trino-main/src/test/java/io/trino/operator/TestDirectExchangeClientConfig.java b/core/trino-main/src/test/java/io/trino/operator/TestDirectExchangeClientConfig.java
@@ -35,7 +35,6 @@ public void testDefaults()
         assertRecordedDefaults(recordDefaults(DirectExchangeClientConfig.class)
                 .setMaxBufferSize(DataSize.of(32, Unit.MEGABYTE))
                 .setConcurrentRequestMultiplier(3)
-                .setMinErrorDuration(new Duration(5, TimeUnit.MINUTES))
                 .setMaxErrorDuration(new Duration(5, TimeUnit.MINUTES))
                 .setMaxResponseSize(new HttpClientConfig().getMaxContentLength())
                 .setPageBufferClientMaxCallbackThreads(25)
@@ -50,7 +49,6 @@ public void testExplicitPropertyMappings()
         Map<String, String> properties = ImmutableMap.<String, String>builder()
                 .put("exchange.max-buffer-size", "1GB")
                 .put("exchange.concurrent-request-multiplier", "13")
-                .put("exchange.min-error-duration", "13s")
                 .put("exchange.max-error-duration", "33s")
                 .put("exchange.max-response-size", "1MB")
                 .put("exchange.client-threads", "2")
@@ -62,7 +60,6 @@ public void testExplicitPropertyMappings()
         DirectExchangeClientConfig expected = new DirectExchangeClientConfig()
                 .setMaxBufferSize(DataSize.of(1, Unit.GIGABYTE))
                 .setConcurrentRequestMultiplier(13)
-                .setMinErrorDuration(new Duration(33, TimeUnit.SECONDS))
                 .setMaxErrorDuration(new Duration(33, TimeUnit.SECONDS))
                 .setMaxResponseSize(DataSize.of(1, Unit.MEGABYTE))
                 .setClientThreads(2)