jihoonson commented on a change in pull request #11084:
URL: https://github.com/apache/druid/pull/11084#discussion_r615061914
##########
File path: docs/operations/metrics.md
##########
@@ -256,6 +256,8 @@ These metrics are for the Druid Coordinator and are reset
each time the Coordina
|`interval/skipCompact/count`|Total number of intervals of this datasource
that are skipped (not eligible for auto compaction) by the auto
compaction.|datasource.|Varies.|
|`coordinator/time`|Approximate Coordinator duty runtime in milliseconds. The
duty dimension is the string alias of the Duty that is being run.|duty.|Varies.|
|`coordinator/global/time`|Approximate runtime of a full coordination cycle in
milliseconds. The `dutyGroup` dimension indicates what type of coordination
this run was. i.e. Historical Management vs Indexing|`dutyGroup`|Varies.|
+|`metadata/kill/audit/count`|Total number of audit logs deleted from metadata
store audit table.| |Varies.|
Review comment:
How is this metric supposed to be used?
BTW, do we also need a metric for the current size (maybe in rows) of the
audit logs? This should be done in a separate PR if needed.
##########
File path: docs/configuration/index.md
##########
@@ -742,6 +742,15 @@ These Coordinator static configurations can be defined in
the `coordinator/runti
|`druid.coordinator.asOverlord.enabled`|Boolean value for whether this
Coordinator process should act like an Overlord as well. This configuration
allows users to simplify a druid cluster by not having to deploy any standalone
Overlord processes. If set to true, then Overlord console is available at
`http://coordinator-host:port/console.html` and be sure to set
`druid.coordinator.asOverlord.overlordService` also. See next.|false|
|`druid.coordinator.asOverlord.overlordService`| Required, if
`druid.coordinator.asOverlord.enabled` is `true`. This must be same value as
`druid.service` on standalone Overlord processes and
`druid.selectors.indexing.serviceName` on Middle Managers.|NULL|
+##### Metadata Management
+
+|Property|Description|Required?|Default|
+|--------|-----------|---------|-------|
+|`druid.coordinator.period.metadataStoreManagementPeriod`|How often to run
metadata management tasks. |No |PT3600S (1 hour)|
+|`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.audit.period`| How often to do automatic deletion of
audit logs. Value must be greater than
`druid.coordinator.period.metadataStoreManagementPeriod`. 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.audit.durationToRetain`| In milliseconds, audit logs
to be retained created in last x milliseconds. Only applies if
`druid.coordinator.kill.audit.on` is set to True.| Yes if
`druid.coordinator.kill.audit.on` is set to True| None|
Review comment:
Hmm seems like this config supports the ISO 8601 notation? Please update
the doc to mention what notation is supported.
##########
File path: docs/configuration/index.md
##########
@@ -742,6 +742,15 @@ These Coordinator static configurations can be defined in
the `coordinator/runti
|`druid.coordinator.asOverlord.enabled`|Boolean value for whether this
Coordinator process should act like an Overlord as well. This configuration
allows users to simplify a druid cluster by not having to deploy any standalone
Overlord processes. If set to true, then Overlord console is available at
`http://coordinator-host:port/console.html` and be sure to set
`druid.coordinator.asOverlord.overlordService` also. See next.|false|
|`druid.coordinator.asOverlord.overlordService`| Required, if
`druid.coordinator.asOverlord.enabled` is `true`. This must be same value as
`druid.service` on standalone Overlord processes and
`druid.selectors.indexing.serviceName` on Middle Managers.|NULL|
+##### Metadata Management
+
+|Property|Description|Required?|Default|
+|--------|-----------|---------|-------|
+|`druid.coordinator.period.metadataStoreManagementPeriod`|How often to run
metadata management tasks. |No |PT3600S (1 hour)|
Review comment:
nit: `PT1H` seems clearer.
##########
File path:
server/src/main/java/org/apache/druid/server/coordinator/duty/KillAuditLog.java
##########
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.server.coordinator.duty;
+
+import com.google.common.base.Preconditions;
+import com.google.inject.Inject;
+import org.apache.druid.audit.AuditManager;
+import org.apache.druid.java.util.common.logger.Logger;
+import org.apache.druid.java.util.emitter.service.ServiceEmitter;
+import org.apache.druid.java.util.emitter.service.ServiceMetricEvent;
+import org.apache.druid.server.coordinator.DruidCoordinatorConfig;
+import org.apache.druid.server.coordinator.DruidCoordinatorRuntimeParams;
+
+public class KillAuditLog implements CoordinatorDuty
+{
+ private static final Logger log = new Logger(KillAuditLog.class);
+
+ private final long period;
+ private final long retainDuration;
+ private long lastKillTime = 0;
+
+ private final AuditManager auditManager;
+
+ @Inject
+ public KillAuditLog(
+ AuditManager auditManager,
+ DruidCoordinatorConfig config
+ )
+ {
+ this.period = config.getCoordinatorAuditKillPeriod().getMillis();
+ Preconditions.checkArgument(
+ this.period >=
config.getCoordinatorMetadataStoreManagementPeriod().getMillis(),
+ "coordinator audit kill period must be >=
druid.coordinator.period.metadataStoreManagementPeriod"
+ );
+ this.retainDuration =
config.getCoordinatorAuditKillDurationToRetain().getMillis();
+ Preconditions.checkArgument(this.retainDuration >= 0, "coordinator audit
kill retainDuration must be >= 0");
+ log.info(
+ "Audit Kill Task scheduling enabled with period [%s], retainDuration
[%s]",
+ this.period,
+ this.retainDuration
+ );
+ this.auditManager = auditManager;
+ }
+
+ @Override
+ public DruidCoordinatorRuntimeParams run(DruidCoordinatorRuntimeParams
params)
+ {
+ if ((lastKillTime + period) < System.currentTimeMillis()) {
+ log.info("Running KillAuditLog duty");
Review comment:
This logging doesn't say much except that this duty is running. Maybe
better to print how many logs are deleted (`auditRemoved`) in this run?
##########
File path:
server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java
##########
@@ -743,13 +756,26 @@ private void stopBeingLeader()
// CompactSegmentsDuty should be the last duty as it can take a long time
to complete
duties.addAll(makeCompactSegmentsDuty());
- log.debug(
+ log.info(
Review comment:
Is change intentional? If so, can you describe why it is better to be
info? I think this was changed to debug to reduce the amount of coordinator
logs.
##########
File path:
server/src/main/java/org/apache/druid/server/coordinator/duty/KillAuditLog.java
##########
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.server.coordinator.duty;
+
+import com.google.common.base.Preconditions;
+import com.google.inject.Inject;
+import org.apache.druid.audit.AuditManager;
+import org.apache.druid.java.util.common.logger.Logger;
+import org.apache.druid.java.util.emitter.service.ServiceEmitter;
+import org.apache.druid.java.util.emitter.service.ServiceMetricEvent;
+import org.apache.druid.server.coordinator.DruidCoordinatorConfig;
+import org.apache.druid.server.coordinator.DruidCoordinatorRuntimeParams;
+
+public class KillAuditLog implements CoordinatorDuty
+{
+ private static final Logger log = new Logger(KillAuditLog.class);
+
+ private final long period;
+ private final long retainDuration;
+ private long lastKillTime = 0;
+
+ private final AuditManager auditManager;
+
+ @Inject
+ public KillAuditLog(
+ AuditManager auditManager,
+ DruidCoordinatorConfig config
+ )
+ {
+ this.period = config.getCoordinatorAuditKillPeriod().getMillis();
+ Preconditions.checkArgument(
+ this.period >=
config.getCoordinatorMetadataStoreManagementPeriod().getMillis(),
+ "coordinator audit kill period must be >=
druid.coordinator.period.metadataStoreManagementPeriod"
+ );
+ this.retainDuration =
config.getCoordinatorAuditKillDurationToRetain().getMillis();
+ Preconditions.checkArgument(this.retainDuration >= 0, "coordinator audit
kill retainDuration must be >= 0");
+ log.info(
Review comment:
Similarly, maybe debug?
##########
File path:
server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java
##########
@@ -743,13 +756,26 @@ private void stopBeingLeader()
// CompactSegmentsDuty should be the last duty as it can take a long time
to complete
duties.addAll(makeCompactSegmentsDuty());
- log.debug(
+ log.info(
"Done making indexing service duties %s",
duties.stream().map(duty ->
duty.getClass().getName()).collect(Collectors.toList())
);
return ImmutableList.copyOf(duties);
}
+ private List<CoordinatorDuty> makeMetadataStoreManagementDuties()
+ {
+ List<CoordinatorDuty> duties = ImmutableList.<CoordinatorDuty>builder()
+
.addAll(metadataStoreManagementDuties)
+ .build();
+
+ log.info(
Review comment:
Similarly, does this log need to be info? Coordinator prints a lot of
logs and it's better to reduce them if possible.
--
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.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
