This is an automated email from the ASF dual-hosted git repository.
suneet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 2b32d86 Enable automatic metdata cleanup by default (#12188)
2b32d86 is described below
commit 2b32d86f3bcbee83b800614f9862f7130635cd92
Author: Suneet Saldanha <[email protected]>
AuthorDate: Mon Jan 24 20:04:17 2022 -0800
Enable automatic metdata cleanup by default (#12188)
---
docs/configuration/index.md | 18 +++++++++---------
.../server/coordinator/DruidCoordinatorConfig.java | 8 ++++----
.../coordinator/DataSourceCompactionConfigTest.java | 3 ++-
.../main/java/org/apache/druid/cli/CliCoordinator.java | 5 +++++
4 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/docs/configuration/index.md b/docs/configuration/index.md
index 336f950..9386f02 100644
--- a/docs/configuration/index.md
+++ b/docs/configuration/index.md
@@ -811,20 +811,20 @@ These Coordinator static configurations can be defined in
the `coordinator/runti
|Property|Description|Required?|Default|
|--------|-----------|---------|-------|
|`druid.coordinator.period.metadataStoreManagementPeriod`|How often to run
metadata management tasks in [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601)
duration format. |No | `PT1H`|
-|`druid.coordinator.kill.supervisor.on`| Boolean value for whether to enable
automatic deletion of terminated supervisors. If set to true, Coordinator will
periodically remove terminated supervisors from the supervisor table in
metadata storage.| No | False|
+|`druid.coordinator.kill.supervisor.on`| Boolean value for whether to enable
automatic deletion of terminated supervisors. If set to true, Coordinator will
periodically remove terminated supervisors from the supervisor table in
metadata storage.| No | True|
|`druid.coordinator.kill.supervisor.period`| How often to do automatic
deletion of terminated supervisor in [ISO
8601](https://en.wikipedia.org/wiki/ISO_8601) duration format. Value must be
equal to or greater than
`druid.coordinator.period.metadataStoreManagementPeriod`. Only applies if
`druid.coordinator.kill.supervisor.on` is set to "True".| No| `P1D`|
-|`druid.coordinator.kill.supervisor.durationToRetain`| Duration of terminated
supervisor to be retained from created time in [ISO
8601](https://en.wikipedia.org/wiki/ISO_8601) duration format. Only applies if
`druid.coordinator.kill.supervisor.on` is set to "True".| Yes if
`druid.coordinator.kill.supervisor.on` is set to "True".| None|
-|`druid.coordinator.kill.audit.on`| Boolean value for whether to enable
automatic deletion of audit logs. If set to true, Coordinator will periodically
remove audit logs from the audit table entries in metadata storage.| No |
False|
+|`druid.coordinator.kill.supervisor.durationToRetain`| Duration of terminated
supervisor to be retained from created time in [ISO
8601](https://en.wikipedia.org/wiki/ISO_8601) duration format. Only applies if
`druid.coordinator.kill.supervisor.on` is set to "True".| Yes if
`druid.coordinator.kill.supervisor.on` is set to "True".| `P90D`|
+|`druid.coordinator.kill.audit.on`| Boolean value for whether to enable
automatic deletion of audit logs. If set to true, Coordinator will periodically
remove audit logs from the audit table entries in metadata storage.| No | True|
|`druid.coordinator.kill.audit.period`| How often to do automatic deletion of
audit logs in [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) duration
format. Value must be equal to or greater than
`druid.coordinator.period.metadataStoreManagementPeriod`. Only applies if
`druid.coordinator.kill.audit.on` is set to "True".| No| `P1D`|
-|`druid.coordinator.kill.audit.durationToRetain`| Duration of audit logs to be
retained from created time in [ISO
8601](https://en.wikipedia.org/wiki/ISO_8601) duration format. Only applies if
`druid.coordinator.kill.audit.on` is set to "True".| Yes if
`druid.coordinator.kill.audit.on` is set to "True".| None|
-|`druid.coordinator.kill.compaction.on`| Boolean value for whether to enable
automatic deletion of compaction configurations. If set to true, Coordinator
will periodically remove compaction configuration of inactive datasource
(datasource with no used and unused segments) from the config table in metadata
storage. | No | False|
+|`druid.coordinator.kill.audit.durationToRetain`| Duration of audit logs to be
retained from created time in [ISO
8601](https://en.wikipedia.org/wiki/ISO_8601) duration format. Only applies if
`druid.coordinator.kill.audit.on` is set to "True".| Yes if
`druid.coordinator.kill.audit.on` is set to "True".| `P90D`|
+|`druid.coordinator.kill.compaction.on`| Boolean value for whether to enable
automatic deletion of compaction configurations. If set to true, Coordinator
will periodically remove compaction configuration of inactive datasource
(datasource with no used and unused segments) from the config table in metadata
storage. | No | True|
|`druid.coordinator.kill.compaction.period`| How often to do automatic
deletion of compaction configurations in [ISO
8601](https://en.wikipedia.org/wiki/ISO_8601) duration format. Value must be
equal to or greater than
`druid.coordinator.period.metadataStoreManagementPeriod`. Only applies if
`druid.coordinator.kill.compaction.on` is set to "True".| No| `P1D`|
-|`druid.coordinator.kill.rule.on`| Boolean value for whether to enable
automatic deletion of rules. If set to true, Coordinator will periodically
remove rules of inactive datasource (datasource with no used and unused
segments) from the rule table in metadata storage.| No | False|
+|`druid.coordinator.kill.rule.on`| Boolean value for whether to enable
automatic deletion of rules. If set to true, Coordinator will periodically
remove rules of inactive datasource (datasource with no used and unused
segments) from the rule table in metadata storage.| No | True|
|`druid.coordinator.kill.rule.period`| How often to do automatic deletion of
rules in [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) duration format.
Value must be equal to or greater than
`druid.coordinator.period.metadataStoreManagementPeriod`. Only applies if
`druid.coordinator.kill.rule.on` is set to "True".| No| `P1D`|
-|`druid.coordinator.kill.rule.durationToRetain`| Duration of rules to be
retained from created time in [ISO
8601](https://en.wikipedia.org/wiki/ISO_8601) duration format. Only applies if
`druid.coordinator.kill.rule.on` is set to "True".| Yes if
`druid.coordinator.kill.rule.on` is set to "True".| None|
-|`druid.coordinator.kill.datasource.on`| Boolean value for whether to enable
automatic deletion of datasource metadata (Note: datasource metadata only
exists for datasource created from supervisor). If set to true, Coordinator
will periodically remove datasource metadata of terminated supervisor from the
datasource table in metadata storage. | No | False|
+|`druid.coordinator.kill.rule.durationToRetain`| Duration of rules to be
retained from created time in [ISO
8601](https://en.wikipedia.org/wiki/ISO_8601) duration format. Only applies if
`druid.coordinator.kill.rule.on` is set to "True".| Yes if
`druid.coordinator.kill.rule.on` is set to "True".| `P90D`|
+|`druid.coordinator.kill.datasource.on`| Boolean value for whether to enable
automatic deletion of datasource metadata (Note: datasource metadata only
exists for datasource created from supervisor). If set to true, Coordinator
will periodically remove datasource metadata of terminated supervisor from the
datasource table in metadata storage. | No | True|
|`druid.coordinator.kill.datasource.period`| How often to do automatic
deletion of datasource metadata in [ISO
8601](https://en.wikipedia.org/wiki/ISO_8601) duration format. Value must be
equal to or greater than
`druid.coordinator.period.metadataStoreManagementPeriod`. Only applies if
`druid.coordinator.kill.datasource.on` is set to "True".| No| `P1D`|
-|`druid.coordinator.kill.datasource.durationToRetain`| Duration of datasource
metadata to be retained from created time in [ISO
8601](https://en.wikipedia.org/wiki/ISO_8601) duration format. Only applies if
`druid.coordinator.kill.datasource.on` is set to "True".| Yes if
`druid.coordinator.kill.datasource.on` is set to "True".| None|
+|`druid.coordinator.kill.datasource.durationToRetain`| Duration of datasource
metadata to be retained from created time in [ISO
8601](https://en.wikipedia.org/wiki/ISO_8601) duration format. Only applies if
`druid.coordinator.kill.datasource.on` is set to "True".| Yes if
`druid.coordinator.kill.datasource.on` is set to "True".| `P90D`|
##### Segment Management
|Property|Possible Values|Description|Default|
diff --git
a/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinatorConfig.java
b/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinatorConfig.java
index 14e3ce0..8491060 100644
---
a/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinatorConfig.java
+++
b/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinatorConfig.java
@@ -60,7 +60,7 @@ public abstract class DruidCoordinatorConfig
public abstract Duration getCoordinatorSupervisorKillPeriod();
@Config("druid.coordinator.kill.supervisor.durationToRetain")
- @Default("PT-1s")
+ @Default("P90D")
public abstract Duration getCoordinatorSupervisorKillDurationToRetain();
@Config("druid.coordinator.kill.audit.period")
@@ -68,7 +68,7 @@ public abstract class DruidCoordinatorConfig
public abstract Duration getCoordinatorAuditKillPeriod();
@Config("druid.coordinator.kill.audit.durationToRetain")
- @Default("PT-1s")
+ @Default("P90D")
public abstract Duration getCoordinatorAuditKillDurationToRetain();
@Config("druid.coordinator.kill.compaction.period")
@@ -80,7 +80,7 @@ public abstract class DruidCoordinatorConfig
public abstract Duration getCoordinatorRuleKillPeriod();
@Config("druid.coordinator.kill.rule.durationToRetain")
- @Default("PT-1s")
+ @Default("P90D")
public abstract Duration getCoordinatorRuleKillDurationToRetain();
@Config("druid.coordinator.kill.datasource.period")
@@ -88,7 +88,7 @@ public abstract class DruidCoordinatorConfig
public abstract Duration getCoordinatorDatasourceKillPeriod();
@Config("druid.coordinator.kill.datasource.durationToRetain")
- @Default("PT-1s")
+ @Default("P90D")
public abstract Duration getCoordinatorDatasourceKillDurationToRetain();
@Config("druid.coordinator.load.timeout")
diff --git
a/server/src/test/java/org/apache/druid/server/coordinator/DataSourceCompactionConfigTest.java
b/server/src/test/java/org/apache/druid/server/coordinator/DataSourceCompactionConfigTest.java
index 4109e6e..c643da1 100644
---
a/server/src/test/java/org/apache/druid/server/coordinator/DataSourceCompactionConfigTest.java
+++
b/server/src/test/java/org/apache/druid/server/coordinator/DataSourceCompactionConfigTest.java
@@ -37,6 +37,7 @@ import
org.apache.druid.segment.data.BitmapSerde.DefaultBitmapSerdeFactory;
import org.apache.druid.segment.data.CompressionFactory.LongEncodingStrategy;
import org.apache.druid.segment.data.CompressionStrategy;
import org.apache.druid.segment.writeout.TmpFileSegmentWriteOutMediumFactory;
+import org.apache.druid.testing.InitializedNullHandlingTest;
import org.joda.time.Duration;
import org.joda.time.Period;
import org.junit.Assert;
@@ -46,7 +47,7 @@ import org.junit.rules.ExpectedException;
import java.io.IOException;
-public class DataSourceCompactionConfigTest
+public class DataSourceCompactionConfigTest extends InitializedNullHandlingTest
{
private static final ObjectMapper OBJECT_MAPPER = new DefaultObjectMapper();
diff --git a/services/src/main/java/org/apache/druid/cli/CliCoordinator.java
b/services/src/main/java/org/apache/druid/cli/CliCoordinator.java
index 26cdade..ae33722 100644
--- a/services/src/main/java/org/apache/druid/cli/CliCoordinator.java
+++ b/services/src/main/java/org/apache/druid/cli/CliCoordinator.java
@@ -283,26 +283,31 @@ public class CliCoordinator extends ServerRunnable
);
conditionalMetadataStoreManagementDutyMultibind.addConditionBinding(
"druid.coordinator.kill.supervisor.on",
+ "true",
Predicates.equalTo("true"),
KillSupervisors.class
);
conditionalMetadataStoreManagementDutyMultibind.addConditionBinding(
"druid.coordinator.kill.audit.on",
+ "true",
Predicates.equalTo("true"),
KillAuditLog.class
);
conditionalMetadataStoreManagementDutyMultibind.addConditionBinding(
"druid.coordinator.kill.rule.on",
+ "true",
Predicates.equalTo("true"),
KillRules.class
);
conditionalMetadataStoreManagementDutyMultibind.addConditionBinding(
"druid.coordinator.kill.datasource.on",
+ "true",
Predicates.equalTo("true"),
KillDatasourceMetadata.class
);
conditionalMetadataStoreManagementDutyMultibind.addConditionBinding(
"druid.coordinator.kill.compaction.on",
+ "true",
Predicates.equalTo("true"),
KillCompactionConfig.class
);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
