github-advanced-security[bot] commented on code in PR #19286:
URL: https://github.com/apache/druid/pull/19286#discussion_r3126662909
##########
indexing-service/src/test/java/org/apache/druid/indexing/overlord/supervisor/autoscaler/LagBasedAutoScalerConfigTest.java:
##########
@@ -278,11 +299,256 @@
true,
null,
null,
+ null,
+ null,
0.5
);
Assert.assertEquals(Double.valueOf(0.5), config.getStopTaskCountRatio());
}
+ @Test
+ public void testScaleDelayFallback() throws Exception
+ {
+ // Neither minScaleUpDelay nor minScaleDownDelay set: both fall back to
minTriggerScaleActionFrequencyMillis
+ LagBasedAutoScalerConfig baseOnly = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ 60000L,
+ null,
+ null,
+ null,
+ null
+ );
+ Assert.assertEquals(60000L,
baseOnly.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.millis(60000), baseOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(60000),
baseOnly.getMinScaleDownDelay());
+
+ // Only minScaleUpDelay set
+ LagBasedAutoScalerConfig upOnly = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ 60000L,
+ Duration.millis(15000),
+ null,
+ null,
+ null
+ );
+ Assert.assertEquals(Duration.millis(15000), upOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(60000), upOnly.getMinScaleDownDelay());
+
+ // Only minScaleDownDelay set
+ LagBasedAutoScalerConfig downOnly = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ 60000L,
+ null,
+ Duration.millis(30000),
+ null,
+ null
+ );
+ Assert.assertEquals(Duration.millis(60000), downOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(30000),
downOnly.getMinScaleDownDelay());
+
+ // Both set: serde roundtrip preserves values
+ LagBasedAutoScalerConfig bothSet = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ null,
+ Duration.millis(15000),
+ Duration.millis(30000),
+ null,
+ null
+ );
+ Assert.assertEquals(Duration.millis(15000), bothSet.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(30000),
bothSet.getMinScaleDownDelay());
+ LagBasedAutoScalerConfig roundTripped = OBJECT_MAPPER.readValue(
+ OBJECT_MAPPER.writeValueAsString(bothSet),
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(bothSet, roundTripped);
+ }
+
+ @Test
+ @SuppressWarnings("deprecation")
+ public void testScaleDelayFallbackViaSerde() throws Exception
+ {
+ // JSON with only minTriggerScaleActionFrequencyMillis (no Duration
fields):
+ // both getMinScaleUpDelay() and getMinScaleDownDelay() should fall back
to it.
+ String json =
"{\"taskCountMax\":10,\"taskCountMin\":1,\"minTriggerScaleActionFrequencyMillis\":45000}";
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(json,
LagBasedAutoScalerConfig.class);
+ Assert.assertEquals(45000L,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.millis(45000), config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(45000), config.getMinScaleDownDelay());
+
+ // JSON with minTriggerScaleActionFrequencyMillis and only minScaleUpDelay:
+ // getMinScaleUpDelay() should return the explicit value;
getMinScaleDownDelay() falls back.
+ String jsonUpOnly = "{\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minTriggerScaleActionFrequencyMillis\":45000,"
+ + "\"minScaleUpDelay\":\"PT10S\"}";
+ LagBasedAutoScalerConfig configUpOnly =
OBJECT_MAPPER.readValue(jsonUpOnly, LagBasedAutoScalerConfig.class);
+ Assert.assertEquals(Duration.standardSeconds(10),
configUpOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(45000),
configUpOnly.getMinScaleDownDelay());
+ }
+
+ @Test
+ @SuppressWarnings("deprecation")
+ public void testMinTriggerScaleActionFrequencyMillisSerdeCompat() throws
Exception
+ {
+ final long defaultMinTriggerMillis = 600_000L;
+
+ // Backwards-compat: nothing set -> deprecated field gets its default and
both direction
+ // delays fall back to it.
+ {
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(
+ "{\"taskCountMax\":10,\"taskCountMin\":1}",
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(defaultMinTriggerMillis,
config.getMinTriggerScaleActionFrequencyMillis());
Review Comment:
## CodeQL / Deprecated method or constructor invocation
Invoking
[LagBasedAutoScalerConfig.getMinTriggerScaleActionFrequencyMillis](1) should be
avoided because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/11110)
##########
indexing-service/src/test/java/org/apache/druid/indexing/overlord/supervisor/autoscaler/LagBasedAutoScalerConfigTest.java:
##########
@@ -278,11 +299,256 @@
true,
null,
null,
+ null,
+ null,
0.5
);
Assert.assertEquals(Double.valueOf(0.5), config.getStopTaskCountRatio());
}
+ @Test
+ public void testScaleDelayFallback() throws Exception
+ {
+ // Neither minScaleUpDelay nor minScaleDownDelay set: both fall back to
minTriggerScaleActionFrequencyMillis
+ LagBasedAutoScalerConfig baseOnly = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ 60000L,
+ null,
+ null,
+ null,
+ null
+ );
+ Assert.assertEquals(60000L,
baseOnly.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.millis(60000), baseOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(60000),
baseOnly.getMinScaleDownDelay());
+
+ // Only minScaleUpDelay set
+ LagBasedAutoScalerConfig upOnly = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ 60000L,
+ Duration.millis(15000),
+ null,
+ null,
+ null
+ );
+ Assert.assertEquals(Duration.millis(15000), upOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(60000), upOnly.getMinScaleDownDelay());
+
+ // Only minScaleDownDelay set
+ LagBasedAutoScalerConfig downOnly = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ 60000L,
+ null,
+ Duration.millis(30000),
+ null,
+ null
+ );
+ Assert.assertEquals(Duration.millis(60000), downOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(30000),
downOnly.getMinScaleDownDelay());
+
+ // Both set: serde roundtrip preserves values
+ LagBasedAutoScalerConfig bothSet = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ null,
+ Duration.millis(15000),
+ Duration.millis(30000),
+ null,
+ null
+ );
+ Assert.assertEquals(Duration.millis(15000), bothSet.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(30000),
bothSet.getMinScaleDownDelay());
+ LagBasedAutoScalerConfig roundTripped = OBJECT_MAPPER.readValue(
+ OBJECT_MAPPER.writeValueAsString(bothSet),
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(bothSet, roundTripped);
+ }
+
+ @Test
+ @SuppressWarnings("deprecation")
+ public void testScaleDelayFallbackViaSerde() throws Exception
+ {
+ // JSON with only minTriggerScaleActionFrequencyMillis (no Duration
fields):
+ // both getMinScaleUpDelay() and getMinScaleDownDelay() should fall back
to it.
+ String json =
"{\"taskCountMax\":10,\"taskCountMin\":1,\"minTriggerScaleActionFrequencyMillis\":45000}";
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(json,
LagBasedAutoScalerConfig.class);
+ Assert.assertEquals(45000L,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.millis(45000), config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(45000), config.getMinScaleDownDelay());
+
+ // JSON with minTriggerScaleActionFrequencyMillis and only minScaleUpDelay:
+ // getMinScaleUpDelay() should return the explicit value;
getMinScaleDownDelay() falls back.
+ String jsonUpOnly = "{\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minTriggerScaleActionFrequencyMillis\":45000,"
+ + "\"minScaleUpDelay\":\"PT10S\"}";
+ LagBasedAutoScalerConfig configUpOnly =
OBJECT_MAPPER.readValue(jsonUpOnly, LagBasedAutoScalerConfig.class);
+ Assert.assertEquals(Duration.standardSeconds(10),
configUpOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(45000),
configUpOnly.getMinScaleDownDelay());
+ }
+
+ @Test
+ @SuppressWarnings("deprecation")
+ public void testMinTriggerScaleActionFrequencyMillisSerdeCompat() throws
Exception
+ {
+ final long defaultMinTriggerMillis = 600_000L;
+
+ // Backwards-compat: nothing set -> deprecated field gets its default and
both direction
+ // delays fall back to it.
+ {
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(
+ "{\"taskCountMax\":10,\"taskCountMin\":1}",
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(defaultMinTriggerMillis,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.millis(defaultMinTriggerMillis),
config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(defaultMinTriggerMillis),
config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Backwards-compat: legacy spec sets only the deprecated field. Both
direction delays fall
+ // back to it.
+ {
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(
+
"{\"taskCountMax\":10,\"taskCountMin\":1,\"minTriggerScaleActionFrequencyMillis\":900000}",
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(900_000L,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.millis(900_000),
config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(900_000),
config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Forwards-compat: direction delays set, deprecated field omitted.
Deprecated field defaults.
+ {
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(
+ "{\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minScaleUpDelay\":\"PT2M\",\"minScaleDownDelay\":\"PT15M\"}",
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(defaultMinTriggerMillis,
config.getMinTriggerScaleActionFrequencyMillis());
Review Comment:
## CodeQL / Deprecated method or constructor invocation
Invoking
[LagBasedAutoScalerConfig.getMinTriggerScaleActionFrequencyMillis](1) should be
avoided because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/11112)
##########
indexing-service/src/test/java/org/apache/druid/indexing/overlord/supervisor/autoscaler/LagBasedAutoScalerConfigTest.java:
##########
@@ -278,11 +299,256 @@
true,
null,
null,
+ null,
+ null,
0.5
);
Assert.assertEquals(Double.valueOf(0.5), config.getStopTaskCountRatio());
}
+ @Test
+ public void testScaleDelayFallback() throws Exception
+ {
+ // Neither minScaleUpDelay nor minScaleDownDelay set: both fall back to
minTriggerScaleActionFrequencyMillis
+ LagBasedAutoScalerConfig baseOnly = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ 60000L,
+ null,
+ null,
+ null,
+ null
+ );
+ Assert.assertEquals(60000L,
baseOnly.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.millis(60000), baseOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(60000),
baseOnly.getMinScaleDownDelay());
+
+ // Only minScaleUpDelay set
+ LagBasedAutoScalerConfig upOnly = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ 60000L,
+ Duration.millis(15000),
+ null,
+ null,
+ null
+ );
+ Assert.assertEquals(Duration.millis(15000), upOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(60000), upOnly.getMinScaleDownDelay());
+
+ // Only minScaleDownDelay set
+ LagBasedAutoScalerConfig downOnly = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ 60000L,
+ null,
+ Duration.millis(30000),
+ null,
+ null
+ );
+ Assert.assertEquals(Duration.millis(60000), downOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(30000),
downOnly.getMinScaleDownDelay());
+
+ // Both set: serde roundtrip preserves values
+ LagBasedAutoScalerConfig bothSet = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ null,
+ Duration.millis(15000),
+ Duration.millis(30000),
+ null,
+ null
+ );
+ Assert.assertEquals(Duration.millis(15000), bothSet.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(30000),
bothSet.getMinScaleDownDelay());
+ LagBasedAutoScalerConfig roundTripped = OBJECT_MAPPER.readValue(
+ OBJECT_MAPPER.writeValueAsString(bothSet),
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(bothSet, roundTripped);
+ }
+
+ @Test
+ @SuppressWarnings("deprecation")
+ public void testScaleDelayFallbackViaSerde() throws Exception
+ {
+ // JSON with only minTriggerScaleActionFrequencyMillis (no Duration
fields):
+ // both getMinScaleUpDelay() and getMinScaleDownDelay() should fall back
to it.
+ String json =
"{\"taskCountMax\":10,\"taskCountMin\":1,\"minTriggerScaleActionFrequencyMillis\":45000}";
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(json,
LagBasedAutoScalerConfig.class);
+ Assert.assertEquals(45000L,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.millis(45000), config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(45000), config.getMinScaleDownDelay());
+
+ // JSON with minTriggerScaleActionFrequencyMillis and only minScaleUpDelay:
+ // getMinScaleUpDelay() should return the explicit value;
getMinScaleDownDelay() falls back.
+ String jsonUpOnly = "{\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minTriggerScaleActionFrequencyMillis\":45000,"
+ + "\"minScaleUpDelay\":\"PT10S\"}";
+ LagBasedAutoScalerConfig configUpOnly =
OBJECT_MAPPER.readValue(jsonUpOnly, LagBasedAutoScalerConfig.class);
+ Assert.assertEquals(Duration.standardSeconds(10),
configUpOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(45000),
configUpOnly.getMinScaleDownDelay());
+ }
+
+ @Test
+ @SuppressWarnings("deprecation")
+ public void testMinTriggerScaleActionFrequencyMillisSerdeCompat() throws
Exception
+ {
+ final long defaultMinTriggerMillis = 600_000L;
+
+ // Backwards-compat: nothing set -> deprecated field gets its default and
both direction
+ // delays fall back to it.
+ {
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(
+ "{\"taskCountMax\":10,\"taskCountMin\":1}",
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(defaultMinTriggerMillis,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.millis(defaultMinTriggerMillis),
config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(defaultMinTriggerMillis),
config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Backwards-compat: legacy spec sets only the deprecated field. Both
direction delays fall
+ // back to it.
+ {
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(
+
"{\"taskCountMax\":10,\"taskCountMin\":1,\"minTriggerScaleActionFrequencyMillis\":900000}",
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(900_000L,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.millis(900_000),
config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(900_000),
config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Forwards-compat: direction delays set, deprecated field omitted.
Deprecated field defaults.
+ {
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(
+ "{\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minScaleUpDelay\":\"PT2M\",\"minScaleDownDelay\":\"PT15M\"}",
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(defaultMinTriggerMillis,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.standardMinutes(2),
config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.standardMinutes(15),
config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Forwards-compat: deprecated field AND direction delays set (overlapping
migration window).
+ // Direction delays win for their own direction; the deprecated field is
preserved.
+ {
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(
+ "{\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minTriggerScaleActionFrequencyMillis\":900000,"
+ + "\"minScaleUpDelay\":\"PT2M\",\"minScaleDownDelay\":\"PT15M\"}",
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(900_000L,
config.getMinTriggerScaleActionFrequencyMillis());
Review Comment:
## CodeQL / Deprecated method or constructor invocation
Invoking
[LagBasedAutoScalerConfig.getMinTriggerScaleActionFrequencyMillis](1) should be
avoided because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/11113)
##########
indexing-service/src/test/java/org/apache/druid/indexing/overlord/supervisor/autoscaler/LagBasedAutoScalerConfigTest.java:
##########
@@ -278,11 +299,256 @@
true,
null,
null,
+ null,
+ null,
0.5
);
Assert.assertEquals(Double.valueOf(0.5), config.getStopTaskCountRatio());
}
+ @Test
+ public void testScaleDelayFallback() throws Exception
+ {
+ // Neither minScaleUpDelay nor minScaleDownDelay set: both fall back to
minTriggerScaleActionFrequencyMillis
+ LagBasedAutoScalerConfig baseOnly = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ 60000L,
+ null,
+ null,
+ null,
+ null
+ );
+ Assert.assertEquals(60000L,
baseOnly.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.millis(60000), baseOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(60000),
baseOnly.getMinScaleDownDelay());
+
+ // Only minScaleUpDelay set
+ LagBasedAutoScalerConfig upOnly = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ 60000L,
+ Duration.millis(15000),
+ null,
+ null,
+ null
+ );
+ Assert.assertEquals(Duration.millis(15000), upOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(60000), upOnly.getMinScaleDownDelay());
+
+ // Only minScaleDownDelay set
+ LagBasedAutoScalerConfig downOnly = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ 60000L,
+ null,
+ Duration.millis(30000),
+ null,
+ null
+ );
+ Assert.assertEquals(Duration.millis(60000), downOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(30000),
downOnly.getMinScaleDownDelay());
+
+ // Both set: serde roundtrip preserves values
+ LagBasedAutoScalerConfig bothSet = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ null,
+ Duration.millis(15000),
+ Duration.millis(30000),
+ null,
+ null
+ );
+ Assert.assertEquals(Duration.millis(15000), bothSet.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(30000),
bothSet.getMinScaleDownDelay());
+ LagBasedAutoScalerConfig roundTripped = OBJECT_MAPPER.readValue(
+ OBJECT_MAPPER.writeValueAsString(bothSet),
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(bothSet, roundTripped);
+ }
+
+ @Test
+ @SuppressWarnings("deprecation")
+ public void testScaleDelayFallbackViaSerde() throws Exception
+ {
+ // JSON with only minTriggerScaleActionFrequencyMillis (no Duration
fields):
+ // both getMinScaleUpDelay() and getMinScaleDownDelay() should fall back
to it.
+ String json =
"{\"taskCountMax\":10,\"taskCountMin\":1,\"minTriggerScaleActionFrequencyMillis\":45000}";
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(json,
LagBasedAutoScalerConfig.class);
+ Assert.assertEquals(45000L,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.millis(45000), config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(45000), config.getMinScaleDownDelay());
+
+ // JSON with minTriggerScaleActionFrequencyMillis and only minScaleUpDelay:
+ // getMinScaleUpDelay() should return the explicit value;
getMinScaleDownDelay() falls back.
+ String jsonUpOnly = "{\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minTriggerScaleActionFrequencyMillis\":45000,"
+ + "\"minScaleUpDelay\":\"PT10S\"}";
+ LagBasedAutoScalerConfig configUpOnly =
OBJECT_MAPPER.readValue(jsonUpOnly, LagBasedAutoScalerConfig.class);
+ Assert.assertEquals(Duration.standardSeconds(10),
configUpOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(45000),
configUpOnly.getMinScaleDownDelay());
+ }
+
+ @Test
+ @SuppressWarnings("deprecation")
+ public void testMinTriggerScaleActionFrequencyMillisSerdeCompat() throws
Exception
+ {
+ final long defaultMinTriggerMillis = 600_000L;
+
+ // Backwards-compat: nothing set -> deprecated field gets its default and
both direction
+ // delays fall back to it.
+ {
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(
+ "{\"taskCountMax\":10,\"taskCountMin\":1}",
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(defaultMinTriggerMillis,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.millis(defaultMinTriggerMillis),
config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(defaultMinTriggerMillis),
config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Backwards-compat: legacy spec sets only the deprecated field. Both
direction delays fall
+ // back to it.
+ {
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(
+
"{\"taskCountMax\":10,\"taskCountMin\":1,\"minTriggerScaleActionFrequencyMillis\":900000}",
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(900_000L,
config.getMinTriggerScaleActionFrequencyMillis());
Review Comment:
## CodeQL / Deprecated method or constructor invocation
Invoking
[LagBasedAutoScalerConfig.getMinTriggerScaleActionFrequencyMillis](1) should be
avoided because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/11111)
##########
indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/autoscaler/CostBasedAutoScalerConfigTest.java:
##########
@@ -197,13 +194,156 @@
Assert.assertEquals(100, config.getTaskCountMax());
Assert.assertEquals(5, config.getTaskCountMin());
Assert.assertEquals(Integer.valueOf(10), config.getTaskCountStart());
- Assert.assertEquals(600000L,
config.getMinTriggerScaleActionFrequencyMillis());
Assert.assertEquals(Double.valueOf(0.8), config.getStopTaskCountRatio());
Assert.assertEquals(60000L, config.getScaleActionPeriodMillis());
Assert.assertEquals(0.6, config.getLagWeight(), 0.001);
Assert.assertEquals(0.4, config.getIdleWeight(), 0.001);
+ Assert.assertEquals(Duration.standardMinutes(5),
config.getMinScaleUpDelay());
Assert.assertEquals(Duration.standardMinutes(10),
config.getMinScaleDownDelay());
Assert.assertTrue(config.isScaleDownOnTaskRolloverOnly());
Assert.assertEquals(30000, config.getHighLagThreshold());
}
+
+ @Test
+ public void testScaleDelayDefaults() throws Exception
+ {
+ // Neither set: each direction gets its own independent default
+ CostBasedAutoScalerConfig defaults = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+ .build();
+ Assert.assertEquals(Duration.millis(DEFAULT_SCALE_ACTION_PERIOD_MILLIS),
defaults.getMinScaleUpDelay());
+ Assert.assertEquals(DEFAULT_MIN_SCALE_DELAY,
defaults.getMinScaleDownDelay());
+
+ // Only minScaleUpDelay set: up uses explicit value, down uses its default
+ CostBasedAutoScalerConfig upOnly = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+
.minScaleUpDelay(Duration.standardMinutes(5))
+ .build();
+ Assert.assertEquals(Duration.standardMinutes(5),
upOnly.getMinScaleUpDelay());
+ Assert.assertEquals(DEFAULT_MIN_SCALE_DELAY,
upOnly.getMinScaleDownDelay());
+
+ // Only minScaleDownDelay set: down uses explicit value, up uses its own
default (does not fall back to down)
+ CostBasedAutoScalerConfig downOnly = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+
.minScaleDownDelay(Duration.standardMinutes(20))
+ .build();
+ Assert.assertEquals(Duration.millis(DEFAULT_SCALE_ACTION_PERIOD_MILLIS),
downOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.standardMinutes(20),
downOnly.getMinScaleDownDelay());
+
+ // Both set: serde roundtrip preserves values
+ CostBasedAutoScalerConfig bothSet = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+
.minScaleUpDelay(Duration.standardMinutes(5))
+
.minScaleDownDelay(Duration.standardMinutes(20))
+ .build();
+ Assert.assertEquals(Duration.standardMinutes(5),
bothSet.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.standardMinutes(20),
bothSet.getMinScaleDownDelay());
+ CostBasedAutoScalerConfig roundTripped =
mapper.readValue(mapper.writeValueAsString(bothSet),
CostBasedAutoScalerConfig.class);
+ Assert.assertEquals(bothSet, roundTripped);
+ }
+
+ @Test
+ @SuppressWarnings("deprecation")
+ public void testMinTriggerScaleActionFrequencyMillisSerdeCompat() throws
Exception
+ {
+ final long defaultMinTriggerMillis = DEFAULT_SCALE_ACTION_PERIOD_MILLIS /
2;
+ final Duration defaultUp =
Duration.millis(DEFAULT_SCALE_ACTION_PERIOD_MILLIS);
+ final Duration defaultDown = DEFAULT_MIN_SCALE_DELAY;
+
+ // Backwards-compat: nothing set -> everything uses its own default.
+ {
+ CostBasedAutoScalerConfig config = mapper.readValue(
+
"{\"autoScalerStrategy\":\"costBased\",\"enableTaskAutoScaler\":true,\"taskCountMax\":10,\"taskCountMin\":1}",
+ CostBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(defaultMinTriggerMillis,
config.getMinTriggerScaleActionFrequencyMillis());
Review Comment:
## CodeQL / Deprecated method or constructor invocation
Invoking
[CostBasedAutoScalerConfig.getMinTriggerScaleActionFrequencyMillis](1) should
be avoided because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/11117)
##########
indexing-service/src/test/java/org/apache/druid/indexing/overlord/supervisor/autoscaler/LagBasedAutoScalerConfigTest.java:
##########
@@ -278,11 +299,256 @@
true,
null,
null,
+ null,
+ null,
0.5
);
Assert.assertEquals(Double.valueOf(0.5), config.getStopTaskCountRatio());
}
+ @Test
+ public void testScaleDelayFallback() throws Exception
+ {
+ // Neither minScaleUpDelay nor minScaleDownDelay set: both fall back to
minTriggerScaleActionFrequencyMillis
+ LagBasedAutoScalerConfig baseOnly = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ 60000L,
+ null,
+ null,
+ null,
+ null
+ );
+ Assert.assertEquals(60000L,
baseOnly.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.millis(60000), baseOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(60000),
baseOnly.getMinScaleDownDelay());
+
+ // Only minScaleUpDelay set
+ LagBasedAutoScalerConfig upOnly = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ 60000L,
+ Duration.millis(15000),
+ null,
+ null,
+ null
+ );
+ Assert.assertEquals(Duration.millis(15000), upOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(60000), upOnly.getMinScaleDownDelay());
+
+ // Only minScaleDownDelay set
+ LagBasedAutoScalerConfig downOnly = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ 60000L,
+ null,
+ Duration.millis(30000),
+ null,
+ null
+ );
+ Assert.assertEquals(Duration.millis(60000), downOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(30000),
downOnly.getMinScaleDownDelay());
+
+ // Both set: serde roundtrip preserves values
+ LagBasedAutoScalerConfig bothSet = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ null,
+ Duration.millis(15000),
+ Duration.millis(30000),
+ null,
+ null
+ );
+ Assert.assertEquals(Duration.millis(15000), bothSet.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(30000),
bothSet.getMinScaleDownDelay());
+ LagBasedAutoScalerConfig roundTripped = OBJECT_MAPPER.readValue(
+ OBJECT_MAPPER.writeValueAsString(bothSet),
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(bothSet, roundTripped);
+ }
+
+ @Test
+ @SuppressWarnings("deprecation")
+ public void testScaleDelayFallbackViaSerde() throws Exception
+ {
+ // JSON with only minTriggerScaleActionFrequencyMillis (no Duration
fields):
+ // both getMinScaleUpDelay() and getMinScaleDownDelay() should fall back
to it.
+ String json =
"{\"taskCountMax\":10,\"taskCountMin\":1,\"minTriggerScaleActionFrequencyMillis\":45000}";
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(json,
LagBasedAutoScalerConfig.class);
+ Assert.assertEquals(45000L,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.millis(45000), config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(45000), config.getMinScaleDownDelay());
+
+ // JSON with minTriggerScaleActionFrequencyMillis and only minScaleUpDelay:
+ // getMinScaleUpDelay() should return the explicit value;
getMinScaleDownDelay() falls back.
+ String jsonUpOnly = "{\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minTriggerScaleActionFrequencyMillis\":45000,"
+ + "\"minScaleUpDelay\":\"PT10S\"}";
+ LagBasedAutoScalerConfig configUpOnly =
OBJECT_MAPPER.readValue(jsonUpOnly, LagBasedAutoScalerConfig.class);
+ Assert.assertEquals(Duration.standardSeconds(10),
configUpOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(45000),
configUpOnly.getMinScaleDownDelay());
+ }
+
+ @Test
+ @SuppressWarnings("deprecation")
+ public void testMinTriggerScaleActionFrequencyMillisSerdeCompat() throws
Exception
+ {
+ final long defaultMinTriggerMillis = 600_000L;
+
+ // Backwards-compat: nothing set -> deprecated field gets its default and
both direction
+ // delays fall back to it.
+ {
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(
+ "{\"taskCountMax\":10,\"taskCountMin\":1}",
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(defaultMinTriggerMillis,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.millis(defaultMinTriggerMillis),
config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(defaultMinTriggerMillis),
config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Backwards-compat: legacy spec sets only the deprecated field. Both
direction delays fall
+ // back to it.
+ {
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(
+
"{\"taskCountMax\":10,\"taskCountMin\":1,\"minTriggerScaleActionFrequencyMillis\":900000}",
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(900_000L,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.millis(900_000),
config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(900_000),
config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Forwards-compat: direction delays set, deprecated field omitted.
Deprecated field defaults.
+ {
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(
+ "{\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minScaleUpDelay\":\"PT2M\",\"minScaleDownDelay\":\"PT15M\"}",
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(defaultMinTriggerMillis,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.standardMinutes(2),
config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.standardMinutes(15),
config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Forwards-compat: deprecated field AND direction delays set (overlapping
migration window).
+ // Direction delays win for their own direction; the deprecated field is
preserved.
+ {
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(
+ "{\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minTriggerScaleActionFrequencyMillis\":900000,"
+ + "\"minScaleUpDelay\":\"PT2M\",\"minScaleDownDelay\":\"PT15M\"}",
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(900_000L,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.standardMinutes(2),
config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.standardMinutes(15),
config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Mixed: only minScaleUpDelay + deprecated field set. Down falls back to
the deprecated field.
+ {
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(
+ "{\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minTriggerScaleActionFrequencyMillis\":900000,"
+ + "\"minScaleUpDelay\":\"PT2M\"}",
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(900_000L,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.standardMinutes(2),
config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(900_000),
config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Mixed: only minScaleDownDelay + deprecated field set. Up falls back to
the deprecated field.
+ {
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(
+ "{\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minTriggerScaleActionFrequencyMillis\":900000,"
+ + "\"minScaleDownDelay\":\"PT15M\"}",
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(900_000L,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.millis(900_000),
config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.standardMinutes(15),
config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Mixed: deprecated field omitted, only minScaleUpDelay set. Down falls
back to the
+ // deprecated field's default.
+ {
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(
+
"{\"taskCountMax\":10,\"taskCountMin\":1,\"minScaleUpDelay\":\"PT2M\"}",
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(defaultMinTriggerMillis,
config.getMinTriggerScaleActionFrequencyMillis());
Review Comment:
## CodeQL / Deprecated method or constructor invocation
Invoking
[LagBasedAutoScalerConfig.getMinTriggerScaleActionFrequencyMillis](1) should be
avoided because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/11116)
##########
indexing-service/src/test/java/org/apache/druid/indexing/overlord/supervisor/autoscaler/LagBasedAutoScalerConfigTest.java:
##########
@@ -278,11 +299,256 @@
true,
null,
null,
+ null,
+ null,
0.5
);
Assert.assertEquals(Double.valueOf(0.5), config.getStopTaskCountRatio());
}
+ @Test
+ public void testScaleDelayFallback() throws Exception
+ {
+ // Neither minScaleUpDelay nor minScaleDownDelay set: both fall back to
minTriggerScaleActionFrequencyMillis
+ LagBasedAutoScalerConfig baseOnly = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ 60000L,
+ null,
+ null,
+ null,
+ null
+ );
+ Assert.assertEquals(60000L,
baseOnly.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.millis(60000), baseOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(60000),
baseOnly.getMinScaleDownDelay());
+
+ // Only minScaleUpDelay set
+ LagBasedAutoScalerConfig upOnly = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ 60000L,
+ Duration.millis(15000),
+ null,
+ null,
+ null
+ );
+ Assert.assertEquals(Duration.millis(15000), upOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(60000), upOnly.getMinScaleDownDelay());
+
+ // Only minScaleDownDelay set
+ LagBasedAutoScalerConfig downOnly = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ 60000L,
+ null,
+ Duration.millis(30000),
+ null,
+ null
+ );
+ Assert.assertEquals(Duration.millis(60000), downOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(30000),
downOnly.getMinScaleDownDelay());
+
+ // Both set: serde roundtrip preserves values
+ LagBasedAutoScalerConfig bothSet = new LagBasedAutoScalerConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 10,
+ null,
+ 1,
+ null,
+ null,
+ false,
+ null,
+ Duration.millis(15000),
+ Duration.millis(30000),
+ null,
+ null
+ );
+ Assert.assertEquals(Duration.millis(15000), bothSet.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(30000),
bothSet.getMinScaleDownDelay());
+ LagBasedAutoScalerConfig roundTripped = OBJECT_MAPPER.readValue(
+ OBJECT_MAPPER.writeValueAsString(bothSet),
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(bothSet, roundTripped);
+ }
+
+ @Test
+ @SuppressWarnings("deprecation")
+ public void testScaleDelayFallbackViaSerde() throws Exception
+ {
+ // JSON with only minTriggerScaleActionFrequencyMillis (no Duration
fields):
+ // both getMinScaleUpDelay() and getMinScaleDownDelay() should fall back
to it.
+ String json =
"{\"taskCountMax\":10,\"taskCountMin\":1,\"minTriggerScaleActionFrequencyMillis\":45000}";
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(json,
LagBasedAutoScalerConfig.class);
+ Assert.assertEquals(45000L,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.millis(45000), config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(45000), config.getMinScaleDownDelay());
+
+ // JSON with minTriggerScaleActionFrequencyMillis and only minScaleUpDelay:
+ // getMinScaleUpDelay() should return the explicit value;
getMinScaleDownDelay() falls back.
+ String jsonUpOnly = "{\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minTriggerScaleActionFrequencyMillis\":45000,"
+ + "\"minScaleUpDelay\":\"PT10S\"}";
+ LagBasedAutoScalerConfig configUpOnly =
OBJECT_MAPPER.readValue(jsonUpOnly, LagBasedAutoScalerConfig.class);
+ Assert.assertEquals(Duration.standardSeconds(10),
configUpOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(45000),
configUpOnly.getMinScaleDownDelay());
+ }
+
+ @Test
+ @SuppressWarnings("deprecation")
+ public void testMinTriggerScaleActionFrequencyMillisSerdeCompat() throws
Exception
+ {
+ final long defaultMinTriggerMillis = 600_000L;
+
+ // Backwards-compat: nothing set -> deprecated field gets its default and
both direction
+ // delays fall back to it.
+ {
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(
+ "{\"taskCountMax\":10,\"taskCountMin\":1}",
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(defaultMinTriggerMillis,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.millis(defaultMinTriggerMillis),
config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(defaultMinTriggerMillis),
config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Backwards-compat: legacy spec sets only the deprecated field. Both
direction delays fall
+ // back to it.
+ {
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(
+
"{\"taskCountMax\":10,\"taskCountMin\":1,\"minTriggerScaleActionFrequencyMillis\":900000}",
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(900_000L,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.millis(900_000),
config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.millis(900_000),
config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Forwards-compat: direction delays set, deprecated field omitted.
Deprecated field defaults.
+ {
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(
+ "{\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minScaleUpDelay\":\"PT2M\",\"minScaleDownDelay\":\"PT15M\"}",
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(defaultMinTriggerMillis,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.standardMinutes(2),
config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.standardMinutes(15),
config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Forwards-compat: deprecated field AND direction delays set (overlapping
migration window).
+ // Direction delays win for their own direction; the deprecated field is
preserved.
+ {
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(
+ "{\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minTriggerScaleActionFrequencyMillis\":900000,"
+ + "\"minScaleUpDelay\":\"PT2M\",\"minScaleDownDelay\":\"PT15M\"}",
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(900_000L,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.standardMinutes(2),
config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.standardMinutes(15),
config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Mixed: only minScaleUpDelay + deprecated field set. Down falls back to
the deprecated field.
+ {
+ LagBasedAutoScalerConfig config = OBJECT_MAPPER.readValue(
+ "{\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minTriggerScaleActionFrequencyMillis\":900000,"
+ + "\"minScaleUpDelay\":\"PT2M\"}",
+ LagBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(900_000L,
config.getMinTriggerScaleActionFrequencyMillis());
Review Comment:
## CodeQL / Deprecated method or constructor invocation
Invoking
[LagBasedAutoScalerConfig.getMinTriggerScaleActionFrequencyMillis](1) should be
avoided because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/11114)
##########
indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/autoscaler/CostBasedAutoScalerConfigTest.java:
##########
@@ -197,13 +194,156 @@
Assert.assertEquals(100, config.getTaskCountMax());
Assert.assertEquals(5, config.getTaskCountMin());
Assert.assertEquals(Integer.valueOf(10), config.getTaskCountStart());
- Assert.assertEquals(600000L,
config.getMinTriggerScaleActionFrequencyMillis());
Assert.assertEquals(Double.valueOf(0.8), config.getStopTaskCountRatio());
Assert.assertEquals(60000L, config.getScaleActionPeriodMillis());
Assert.assertEquals(0.6, config.getLagWeight(), 0.001);
Assert.assertEquals(0.4, config.getIdleWeight(), 0.001);
+ Assert.assertEquals(Duration.standardMinutes(5),
config.getMinScaleUpDelay());
Assert.assertEquals(Duration.standardMinutes(10),
config.getMinScaleDownDelay());
Assert.assertTrue(config.isScaleDownOnTaskRolloverOnly());
Assert.assertEquals(30000, config.getHighLagThreshold());
}
+
+ @Test
+ public void testScaleDelayDefaults() throws Exception
+ {
+ // Neither set: each direction gets its own independent default
+ CostBasedAutoScalerConfig defaults = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+ .build();
+ Assert.assertEquals(Duration.millis(DEFAULT_SCALE_ACTION_PERIOD_MILLIS),
defaults.getMinScaleUpDelay());
+ Assert.assertEquals(DEFAULT_MIN_SCALE_DELAY,
defaults.getMinScaleDownDelay());
+
+ // Only minScaleUpDelay set: up uses explicit value, down uses its default
+ CostBasedAutoScalerConfig upOnly = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+
.minScaleUpDelay(Duration.standardMinutes(5))
+ .build();
+ Assert.assertEquals(Duration.standardMinutes(5),
upOnly.getMinScaleUpDelay());
+ Assert.assertEquals(DEFAULT_MIN_SCALE_DELAY,
upOnly.getMinScaleDownDelay());
+
+ // Only minScaleDownDelay set: down uses explicit value, up uses its own
default (does not fall back to down)
+ CostBasedAutoScalerConfig downOnly = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+
.minScaleDownDelay(Duration.standardMinutes(20))
+ .build();
+ Assert.assertEquals(Duration.millis(DEFAULT_SCALE_ACTION_PERIOD_MILLIS),
downOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.standardMinutes(20),
downOnly.getMinScaleDownDelay());
+
+ // Both set: serde roundtrip preserves values
+ CostBasedAutoScalerConfig bothSet = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+
.minScaleUpDelay(Duration.standardMinutes(5))
+
.minScaleDownDelay(Duration.standardMinutes(20))
+ .build();
+ Assert.assertEquals(Duration.standardMinutes(5),
bothSet.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.standardMinutes(20),
bothSet.getMinScaleDownDelay());
+ CostBasedAutoScalerConfig roundTripped =
mapper.readValue(mapper.writeValueAsString(bothSet),
CostBasedAutoScalerConfig.class);
+ Assert.assertEquals(bothSet, roundTripped);
+ }
+
+ @Test
+ @SuppressWarnings("deprecation")
+ public void testMinTriggerScaleActionFrequencyMillisSerdeCompat() throws
Exception
+ {
+ final long defaultMinTriggerMillis = DEFAULT_SCALE_ACTION_PERIOD_MILLIS /
2;
+ final Duration defaultUp =
Duration.millis(DEFAULT_SCALE_ACTION_PERIOD_MILLIS);
+ final Duration defaultDown = DEFAULT_MIN_SCALE_DELAY;
+
+ // Backwards-compat: nothing set -> everything uses its own default.
+ {
+ CostBasedAutoScalerConfig config = mapper.readValue(
+
"{\"autoScalerStrategy\":\"costBased\",\"enableTaskAutoScaler\":true,\"taskCountMax\":10,\"taskCountMin\":1}",
+ CostBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(defaultMinTriggerMillis,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(defaultUp, config.getMinScaleUpDelay());
+ Assert.assertEquals(defaultDown, config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Backwards-compat: legacy spec sets only the deprecated field. Direction
delays still use
+ // their own defaults (no cross-field fallback in CostBased).
+ {
+ CostBasedAutoScalerConfig config = mapper.readValue(
+
"{\"autoScalerStrategy\":\"costBased\",\"enableTaskAutoScaler\":true,\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minTriggerScaleActionFrequencyMillis\":900000}",
+ CostBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(900_000L,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(defaultUp, config.getMinScaleUpDelay());
+ Assert.assertEquals(defaultDown, config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Forwards-compat: direction delays set, deprecated field omitted.
Deprecated field defaults.
+ {
+ CostBasedAutoScalerConfig config = mapper.readValue(
+
"{\"autoScalerStrategy\":\"costBased\",\"enableTaskAutoScaler\":true,\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minScaleUpDelay\":\"PT2M\",\"minScaleDownDelay\":\"PT15M\"}",
+ CostBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(defaultMinTriggerMillis,
config.getMinTriggerScaleActionFrequencyMillis());
Review Comment:
## CodeQL / Deprecated method or constructor invocation
Invoking
[CostBasedAutoScalerConfig.getMinTriggerScaleActionFrequencyMillis](1) should
be avoided because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/11119)
##########
indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/autoscaler/CostBasedAutoScalerConfigTest.java:
##########
@@ -197,13 +194,156 @@
Assert.assertEquals(100, config.getTaskCountMax());
Assert.assertEquals(5, config.getTaskCountMin());
Assert.assertEquals(Integer.valueOf(10), config.getTaskCountStart());
- Assert.assertEquals(600000L,
config.getMinTriggerScaleActionFrequencyMillis());
Assert.assertEquals(Double.valueOf(0.8), config.getStopTaskCountRatio());
Assert.assertEquals(60000L, config.getScaleActionPeriodMillis());
Assert.assertEquals(0.6, config.getLagWeight(), 0.001);
Assert.assertEquals(0.4, config.getIdleWeight(), 0.001);
+ Assert.assertEquals(Duration.standardMinutes(5),
config.getMinScaleUpDelay());
Assert.assertEquals(Duration.standardMinutes(10),
config.getMinScaleDownDelay());
Assert.assertTrue(config.isScaleDownOnTaskRolloverOnly());
Assert.assertEquals(30000, config.getHighLagThreshold());
}
+
+ @Test
+ public void testScaleDelayDefaults() throws Exception
+ {
+ // Neither set: each direction gets its own independent default
+ CostBasedAutoScalerConfig defaults = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+ .build();
+ Assert.assertEquals(Duration.millis(DEFAULT_SCALE_ACTION_PERIOD_MILLIS),
defaults.getMinScaleUpDelay());
+ Assert.assertEquals(DEFAULT_MIN_SCALE_DELAY,
defaults.getMinScaleDownDelay());
+
+ // Only minScaleUpDelay set: up uses explicit value, down uses its default
+ CostBasedAutoScalerConfig upOnly = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+
.minScaleUpDelay(Duration.standardMinutes(5))
+ .build();
+ Assert.assertEquals(Duration.standardMinutes(5),
upOnly.getMinScaleUpDelay());
+ Assert.assertEquals(DEFAULT_MIN_SCALE_DELAY,
upOnly.getMinScaleDownDelay());
+
+ // Only minScaleDownDelay set: down uses explicit value, up uses its own
default (does not fall back to down)
+ CostBasedAutoScalerConfig downOnly = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+
.minScaleDownDelay(Duration.standardMinutes(20))
+ .build();
+ Assert.assertEquals(Duration.millis(DEFAULT_SCALE_ACTION_PERIOD_MILLIS),
downOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.standardMinutes(20),
downOnly.getMinScaleDownDelay());
+
+ // Both set: serde roundtrip preserves values
+ CostBasedAutoScalerConfig bothSet = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+
.minScaleUpDelay(Duration.standardMinutes(5))
+
.minScaleDownDelay(Duration.standardMinutes(20))
+ .build();
+ Assert.assertEquals(Duration.standardMinutes(5),
bothSet.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.standardMinutes(20),
bothSet.getMinScaleDownDelay());
+ CostBasedAutoScalerConfig roundTripped =
mapper.readValue(mapper.writeValueAsString(bothSet),
CostBasedAutoScalerConfig.class);
+ Assert.assertEquals(bothSet, roundTripped);
+ }
+
+ @Test
+ @SuppressWarnings("deprecation")
+ public void testMinTriggerScaleActionFrequencyMillisSerdeCompat() throws
Exception
+ {
+ final long defaultMinTriggerMillis = DEFAULT_SCALE_ACTION_PERIOD_MILLIS /
2;
+ final Duration defaultUp =
Duration.millis(DEFAULT_SCALE_ACTION_PERIOD_MILLIS);
+ final Duration defaultDown = DEFAULT_MIN_SCALE_DELAY;
+
+ // Backwards-compat: nothing set -> everything uses its own default.
+ {
+ CostBasedAutoScalerConfig config = mapper.readValue(
+
"{\"autoScalerStrategy\":\"costBased\",\"enableTaskAutoScaler\":true,\"taskCountMax\":10,\"taskCountMin\":1}",
+ CostBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(defaultMinTriggerMillis,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(defaultUp, config.getMinScaleUpDelay());
+ Assert.assertEquals(defaultDown, config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Backwards-compat: legacy spec sets only the deprecated field. Direction
delays still use
+ // their own defaults (no cross-field fallback in CostBased).
+ {
+ CostBasedAutoScalerConfig config = mapper.readValue(
+
"{\"autoScalerStrategy\":\"costBased\",\"enableTaskAutoScaler\":true,\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minTriggerScaleActionFrequencyMillis\":900000}",
+ CostBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(900_000L,
config.getMinTriggerScaleActionFrequencyMillis());
Review Comment:
## CodeQL / Deprecated method or constructor invocation
Invoking
[CostBasedAutoScalerConfig.getMinTriggerScaleActionFrequencyMillis](1) should
be avoided because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/11118)
##########
indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/autoscaler/CostBasedAutoScalerConfigTest.java:
##########
@@ -197,13 +194,156 @@
Assert.assertEquals(100, config.getTaskCountMax());
Assert.assertEquals(5, config.getTaskCountMin());
Assert.assertEquals(Integer.valueOf(10), config.getTaskCountStart());
- Assert.assertEquals(600000L,
config.getMinTriggerScaleActionFrequencyMillis());
Assert.assertEquals(Double.valueOf(0.8), config.getStopTaskCountRatio());
Assert.assertEquals(60000L, config.getScaleActionPeriodMillis());
Assert.assertEquals(0.6, config.getLagWeight(), 0.001);
Assert.assertEquals(0.4, config.getIdleWeight(), 0.001);
+ Assert.assertEquals(Duration.standardMinutes(5),
config.getMinScaleUpDelay());
Assert.assertEquals(Duration.standardMinutes(10),
config.getMinScaleDownDelay());
Assert.assertTrue(config.isScaleDownOnTaskRolloverOnly());
Assert.assertEquals(30000, config.getHighLagThreshold());
}
+
+ @Test
+ public void testScaleDelayDefaults() throws Exception
+ {
+ // Neither set: each direction gets its own independent default
+ CostBasedAutoScalerConfig defaults = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+ .build();
+ Assert.assertEquals(Duration.millis(DEFAULT_SCALE_ACTION_PERIOD_MILLIS),
defaults.getMinScaleUpDelay());
+ Assert.assertEquals(DEFAULT_MIN_SCALE_DELAY,
defaults.getMinScaleDownDelay());
+
+ // Only minScaleUpDelay set: up uses explicit value, down uses its default
+ CostBasedAutoScalerConfig upOnly = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+
.minScaleUpDelay(Duration.standardMinutes(5))
+ .build();
+ Assert.assertEquals(Duration.standardMinutes(5),
upOnly.getMinScaleUpDelay());
+ Assert.assertEquals(DEFAULT_MIN_SCALE_DELAY,
upOnly.getMinScaleDownDelay());
+
+ // Only minScaleDownDelay set: down uses explicit value, up uses its own
default (does not fall back to down)
+ CostBasedAutoScalerConfig downOnly = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+
.minScaleDownDelay(Duration.standardMinutes(20))
+ .build();
+ Assert.assertEquals(Duration.millis(DEFAULT_SCALE_ACTION_PERIOD_MILLIS),
downOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.standardMinutes(20),
downOnly.getMinScaleDownDelay());
+
+ // Both set: serde roundtrip preserves values
+ CostBasedAutoScalerConfig bothSet = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+
.minScaleUpDelay(Duration.standardMinutes(5))
+
.minScaleDownDelay(Duration.standardMinutes(20))
+ .build();
+ Assert.assertEquals(Duration.standardMinutes(5),
bothSet.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.standardMinutes(20),
bothSet.getMinScaleDownDelay());
+ CostBasedAutoScalerConfig roundTripped =
mapper.readValue(mapper.writeValueAsString(bothSet),
CostBasedAutoScalerConfig.class);
+ Assert.assertEquals(bothSet, roundTripped);
+ }
+
+ @Test
+ @SuppressWarnings("deprecation")
+ public void testMinTriggerScaleActionFrequencyMillisSerdeCompat() throws
Exception
+ {
+ final long defaultMinTriggerMillis = DEFAULT_SCALE_ACTION_PERIOD_MILLIS /
2;
+ final Duration defaultUp =
Duration.millis(DEFAULT_SCALE_ACTION_PERIOD_MILLIS);
+ final Duration defaultDown = DEFAULT_MIN_SCALE_DELAY;
+
+ // Backwards-compat: nothing set -> everything uses its own default.
+ {
+ CostBasedAutoScalerConfig config = mapper.readValue(
+
"{\"autoScalerStrategy\":\"costBased\",\"enableTaskAutoScaler\":true,\"taskCountMax\":10,\"taskCountMin\":1}",
+ CostBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(defaultMinTriggerMillis,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(defaultUp, config.getMinScaleUpDelay());
+ Assert.assertEquals(defaultDown, config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Backwards-compat: legacy spec sets only the deprecated field. Direction
delays still use
+ // their own defaults (no cross-field fallback in CostBased).
+ {
+ CostBasedAutoScalerConfig config = mapper.readValue(
+
"{\"autoScalerStrategy\":\"costBased\",\"enableTaskAutoScaler\":true,\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minTriggerScaleActionFrequencyMillis\":900000}",
+ CostBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(900_000L,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(defaultUp, config.getMinScaleUpDelay());
+ Assert.assertEquals(defaultDown, config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Forwards-compat: direction delays set, deprecated field omitted.
Deprecated field defaults.
+ {
+ CostBasedAutoScalerConfig config = mapper.readValue(
+
"{\"autoScalerStrategy\":\"costBased\",\"enableTaskAutoScaler\":true,\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minScaleUpDelay\":\"PT2M\",\"minScaleDownDelay\":\"PT15M\"}",
+ CostBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(defaultMinTriggerMillis,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.standardMinutes(2),
config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.standardMinutes(15),
config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Forwards-compat: deprecated field AND direction delays set (overlapping
migration window).
+ // All three are honored independently.
+ {
+ CostBasedAutoScalerConfig config = mapper.readValue(
+
"{\"autoScalerStrategy\":\"costBased\",\"enableTaskAutoScaler\":true,\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minTriggerScaleActionFrequencyMillis\":900000,"
+ + "\"minScaleUpDelay\":\"PT2M\",\"minScaleDownDelay\":\"PT15M\"}",
+ CostBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(900_000L,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.standardMinutes(2),
config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.standardMinutes(15),
config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Only minScaleUpDelay set alongside the deprecated field: down uses its
own default,
+ // not the deprecated field's value.
+ {
+ CostBasedAutoScalerConfig config = mapper.readValue(
+
"{\"autoScalerStrategy\":\"costBased\",\"enableTaskAutoScaler\":true,\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minTriggerScaleActionFrequencyMillis\":900000,"
+ + "\"minScaleUpDelay\":\"PT2M\"}",
+ CostBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(900_000L,
config.getMinTriggerScaleActionFrequencyMillis());
Review Comment:
## CodeQL / Deprecated method or constructor invocation
Invoking
[CostBasedAutoScalerConfig.getMinTriggerScaleActionFrequencyMillis](1) should
be avoided because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/11121)
##########
indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/autoscaler/CostBasedAutoScalerConfigTest.java:
##########
@@ -197,13 +194,156 @@
Assert.assertEquals(100, config.getTaskCountMax());
Assert.assertEquals(5, config.getTaskCountMin());
Assert.assertEquals(Integer.valueOf(10), config.getTaskCountStart());
- Assert.assertEquals(600000L,
config.getMinTriggerScaleActionFrequencyMillis());
Assert.assertEquals(Double.valueOf(0.8), config.getStopTaskCountRatio());
Assert.assertEquals(60000L, config.getScaleActionPeriodMillis());
Assert.assertEquals(0.6, config.getLagWeight(), 0.001);
Assert.assertEquals(0.4, config.getIdleWeight(), 0.001);
+ Assert.assertEquals(Duration.standardMinutes(5),
config.getMinScaleUpDelay());
Assert.assertEquals(Duration.standardMinutes(10),
config.getMinScaleDownDelay());
Assert.assertTrue(config.isScaleDownOnTaskRolloverOnly());
Assert.assertEquals(30000, config.getHighLagThreshold());
}
+
+ @Test
+ public void testScaleDelayDefaults() throws Exception
+ {
+ // Neither set: each direction gets its own independent default
+ CostBasedAutoScalerConfig defaults = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+ .build();
+ Assert.assertEquals(Duration.millis(DEFAULT_SCALE_ACTION_PERIOD_MILLIS),
defaults.getMinScaleUpDelay());
+ Assert.assertEquals(DEFAULT_MIN_SCALE_DELAY,
defaults.getMinScaleDownDelay());
+
+ // Only minScaleUpDelay set: up uses explicit value, down uses its default
+ CostBasedAutoScalerConfig upOnly = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+
.minScaleUpDelay(Duration.standardMinutes(5))
+ .build();
+ Assert.assertEquals(Duration.standardMinutes(5),
upOnly.getMinScaleUpDelay());
+ Assert.assertEquals(DEFAULT_MIN_SCALE_DELAY,
upOnly.getMinScaleDownDelay());
+
+ // Only minScaleDownDelay set: down uses explicit value, up uses its own
default (does not fall back to down)
+ CostBasedAutoScalerConfig downOnly = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+
.minScaleDownDelay(Duration.standardMinutes(20))
+ .build();
+ Assert.assertEquals(Duration.millis(DEFAULT_SCALE_ACTION_PERIOD_MILLIS),
downOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.standardMinutes(20),
downOnly.getMinScaleDownDelay());
+
+ // Both set: serde roundtrip preserves values
+ CostBasedAutoScalerConfig bothSet = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+
.minScaleUpDelay(Duration.standardMinutes(5))
+
.minScaleDownDelay(Duration.standardMinutes(20))
+ .build();
+ Assert.assertEquals(Duration.standardMinutes(5),
bothSet.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.standardMinutes(20),
bothSet.getMinScaleDownDelay());
+ CostBasedAutoScalerConfig roundTripped =
mapper.readValue(mapper.writeValueAsString(bothSet),
CostBasedAutoScalerConfig.class);
+ Assert.assertEquals(bothSet, roundTripped);
+ }
+
+ @Test
+ @SuppressWarnings("deprecation")
+ public void testMinTriggerScaleActionFrequencyMillisSerdeCompat() throws
Exception
+ {
+ final long defaultMinTriggerMillis = DEFAULT_SCALE_ACTION_PERIOD_MILLIS /
2;
+ final Duration defaultUp =
Duration.millis(DEFAULT_SCALE_ACTION_PERIOD_MILLIS);
+ final Duration defaultDown = DEFAULT_MIN_SCALE_DELAY;
+
+ // Backwards-compat: nothing set -> everything uses its own default.
+ {
+ CostBasedAutoScalerConfig config = mapper.readValue(
+
"{\"autoScalerStrategy\":\"costBased\",\"enableTaskAutoScaler\":true,\"taskCountMax\":10,\"taskCountMin\":1}",
+ CostBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(defaultMinTriggerMillis,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(defaultUp, config.getMinScaleUpDelay());
+ Assert.assertEquals(defaultDown, config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Backwards-compat: legacy spec sets only the deprecated field. Direction
delays still use
+ // their own defaults (no cross-field fallback in CostBased).
+ {
+ CostBasedAutoScalerConfig config = mapper.readValue(
+
"{\"autoScalerStrategy\":\"costBased\",\"enableTaskAutoScaler\":true,\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minTriggerScaleActionFrequencyMillis\":900000}",
+ CostBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(900_000L,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(defaultUp, config.getMinScaleUpDelay());
+ Assert.assertEquals(defaultDown, config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Forwards-compat: direction delays set, deprecated field omitted.
Deprecated field defaults.
+ {
+ CostBasedAutoScalerConfig config = mapper.readValue(
+
"{\"autoScalerStrategy\":\"costBased\",\"enableTaskAutoScaler\":true,\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minScaleUpDelay\":\"PT2M\",\"minScaleDownDelay\":\"PT15M\"}",
+ CostBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(defaultMinTriggerMillis,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.standardMinutes(2),
config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.standardMinutes(15),
config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Forwards-compat: deprecated field AND direction delays set (overlapping
migration window).
+ // All three are honored independently.
+ {
+ CostBasedAutoScalerConfig config = mapper.readValue(
+
"{\"autoScalerStrategy\":\"costBased\",\"enableTaskAutoScaler\":true,\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minTriggerScaleActionFrequencyMillis\":900000,"
+ + "\"minScaleUpDelay\":\"PT2M\",\"minScaleDownDelay\":\"PT15M\"}",
+ CostBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(900_000L,
config.getMinTriggerScaleActionFrequencyMillis());
Review Comment:
## CodeQL / Deprecated method or constructor invocation
Invoking
[CostBasedAutoScalerConfig.getMinTriggerScaleActionFrequencyMillis](1) should
be avoided because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/11120)
##########
indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/autoscaler/CostBasedAutoScalerConfigTest.java:
##########
@@ -197,13 +194,156 @@
Assert.assertEquals(100, config.getTaskCountMax());
Assert.assertEquals(5, config.getTaskCountMin());
Assert.assertEquals(Integer.valueOf(10), config.getTaskCountStart());
- Assert.assertEquals(600000L,
config.getMinTriggerScaleActionFrequencyMillis());
Assert.assertEquals(Double.valueOf(0.8), config.getStopTaskCountRatio());
Assert.assertEquals(60000L, config.getScaleActionPeriodMillis());
Assert.assertEquals(0.6, config.getLagWeight(), 0.001);
Assert.assertEquals(0.4, config.getIdleWeight(), 0.001);
+ Assert.assertEquals(Duration.standardMinutes(5),
config.getMinScaleUpDelay());
Assert.assertEquals(Duration.standardMinutes(10),
config.getMinScaleDownDelay());
Assert.assertTrue(config.isScaleDownOnTaskRolloverOnly());
Assert.assertEquals(30000, config.getHighLagThreshold());
}
+
+ @Test
+ public void testScaleDelayDefaults() throws Exception
+ {
+ // Neither set: each direction gets its own independent default
+ CostBasedAutoScalerConfig defaults = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+ .build();
+ Assert.assertEquals(Duration.millis(DEFAULT_SCALE_ACTION_PERIOD_MILLIS),
defaults.getMinScaleUpDelay());
+ Assert.assertEquals(DEFAULT_MIN_SCALE_DELAY,
defaults.getMinScaleDownDelay());
+
+ // Only minScaleUpDelay set: up uses explicit value, down uses its default
+ CostBasedAutoScalerConfig upOnly = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+
.minScaleUpDelay(Duration.standardMinutes(5))
+ .build();
+ Assert.assertEquals(Duration.standardMinutes(5),
upOnly.getMinScaleUpDelay());
+ Assert.assertEquals(DEFAULT_MIN_SCALE_DELAY,
upOnly.getMinScaleDownDelay());
+
+ // Only minScaleDownDelay set: down uses explicit value, up uses its own
default (does not fall back to down)
+ CostBasedAutoScalerConfig downOnly = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+
.minScaleDownDelay(Duration.standardMinutes(20))
+ .build();
+ Assert.assertEquals(Duration.millis(DEFAULT_SCALE_ACTION_PERIOD_MILLIS),
downOnly.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.standardMinutes(20),
downOnly.getMinScaleDownDelay());
+
+ // Both set: serde roundtrip preserves values
+ CostBasedAutoScalerConfig bothSet = CostBasedAutoScalerConfig.builder()
+
.taskCountMax(10)
+
.taskCountMin(1)
+
.minScaleUpDelay(Duration.standardMinutes(5))
+
.minScaleDownDelay(Duration.standardMinutes(20))
+ .build();
+ Assert.assertEquals(Duration.standardMinutes(5),
bothSet.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.standardMinutes(20),
bothSet.getMinScaleDownDelay());
+ CostBasedAutoScalerConfig roundTripped =
mapper.readValue(mapper.writeValueAsString(bothSet),
CostBasedAutoScalerConfig.class);
+ Assert.assertEquals(bothSet, roundTripped);
+ }
+
+ @Test
+ @SuppressWarnings("deprecation")
+ public void testMinTriggerScaleActionFrequencyMillisSerdeCompat() throws
Exception
+ {
+ final long defaultMinTriggerMillis = DEFAULT_SCALE_ACTION_PERIOD_MILLIS /
2;
+ final Duration defaultUp =
Duration.millis(DEFAULT_SCALE_ACTION_PERIOD_MILLIS);
+ final Duration defaultDown = DEFAULT_MIN_SCALE_DELAY;
+
+ // Backwards-compat: nothing set -> everything uses its own default.
+ {
+ CostBasedAutoScalerConfig config = mapper.readValue(
+
"{\"autoScalerStrategy\":\"costBased\",\"enableTaskAutoScaler\":true,\"taskCountMax\":10,\"taskCountMin\":1}",
+ CostBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(defaultMinTriggerMillis,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(defaultUp, config.getMinScaleUpDelay());
+ Assert.assertEquals(defaultDown, config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Backwards-compat: legacy spec sets only the deprecated field. Direction
delays still use
+ // their own defaults (no cross-field fallback in CostBased).
+ {
+ CostBasedAutoScalerConfig config = mapper.readValue(
+
"{\"autoScalerStrategy\":\"costBased\",\"enableTaskAutoScaler\":true,\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minTriggerScaleActionFrequencyMillis\":900000}",
+ CostBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(900_000L,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(defaultUp, config.getMinScaleUpDelay());
+ Assert.assertEquals(defaultDown, config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Forwards-compat: direction delays set, deprecated field omitted.
Deprecated field defaults.
+ {
+ CostBasedAutoScalerConfig config = mapper.readValue(
+
"{\"autoScalerStrategy\":\"costBased\",\"enableTaskAutoScaler\":true,\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minScaleUpDelay\":\"PT2M\",\"minScaleDownDelay\":\"PT15M\"}",
+ CostBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(defaultMinTriggerMillis,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.standardMinutes(2),
config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.standardMinutes(15),
config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Forwards-compat: deprecated field AND direction delays set (overlapping
migration window).
+ // All three are honored independently.
+ {
+ CostBasedAutoScalerConfig config = mapper.readValue(
+
"{\"autoScalerStrategy\":\"costBased\",\"enableTaskAutoScaler\":true,\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minTriggerScaleActionFrequencyMillis\":900000,"
+ + "\"minScaleUpDelay\":\"PT2M\",\"minScaleDownDelay\":\"PT15M\"}",
+ CostBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(900_000L,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.standardMinutes(2),
config.getMinScaleUpDelay());
+ Assert.assertEquals(Duration.standardMinutes(15),
config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Only minScaleUpDelay set alongside the deprecated field: down uses its
own default,
+ // not the deprecated field's value.
+ {
+ CostBasedAutoScalerConfig config = mapper.readValue(
+
"{\"autoScalerStrategy\":\"costBased\",\"enableTaskAutoScaler\":true,\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minTriggerScaleActionFrequencyMillis\":900000,"
+ + "\"minScaleUpDelay\":\"PT2M\"}",
+ CostBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(900_000L,
config.getMinTriggerScaleActionFrequencyMillis());
+ Assert.assertEquals(Duration.standardMinutes(2),
config.getMinScaleUpDelay());
+ Assert.assertEquals(defaultDown, config.getMinScaleDownDelay());
+ assertRoundTrips(config);
+ }
+
+ // Only minScaleDownDelay set alongside the deprecated field: up uses its
own default.
+ {
+ CostBasedAutoScalerConfig config = mapper.readValue(
+
"{\"autoScalerStrategy\":\"costBased\",\"enableTaskAutoScaler\":true,\"taskCountMax\":10,\"taskCountMin\":1,"
+ + "\"minTriggerScaleActionFrequencyMillis\":900000,"
+ + "\"minScaleDownDelay\":\"PT15M\"}",
+ CostBasedAutoScalerConfig.class
+ );
+ Assert.assertEquals(900_000L,
config.getMinTriggerScaleActionFrequencyMillis());
Review Comment:
## CodeQL / Deprecated method or constructor invocation
Invoking
[CostBasedAutoScalerConfig.getMinTriggerScaleActionFrequencyMillis](1) should
be avoided because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/11122)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
