stevenzwu commented on code in PR #11010: URL: https://github.com/apache/iceberg/pull/11010#discussion_r1733146479
########## flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/maintenance/operator/LockRemover.java: ########## @@ -0,0 +1,120 @@ +/* + * 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.iceberg.flink.maintenance.operator; + +import java.util.List; +import java.util.concurrent.atomic.AtomicLong; +import org.apache.flink.annotation.Internal; +import org.apache.flink.metrics.Counter; +import org.apache.flink.streaming.api.operators.AbstractStreamOperator; +import org.apache.flink.streaming.api.operators.OneInputStreamOperator; +import org.apache.flink.streaming.api.watermark.Watermark; +import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** Manages locks and collect {@link org.apache.flink.metrics.Metric} for the Maintenance Tasks. */ +@Internal +public class LockRemover extends AbstractStreamOperator<MaintenanceResult> + implements OneInputStreamOperator<TaskResult, MaintenanceResult> { + private static final Logger LOG = LoggerFactory.getLogger(LockRemover.class); + + private final TriggerLockFactory lockFactory; + private final List<String> taskNames; + + private transient List<Counter> succeededTaskResultCounterMap; + private transient List<Counter> failedTaskResultCounterMap; + private transient List<AtomicLong> lastRunDuration; + private transient TriggerLockFactory.Lock lock; + private transient TriggerLockFactory.Lock recoveryLock; + private transient long lastProcessed = 0L; + + public LockRemover(TriggerLockFactory lockFactory, List<String> taskNames) { + Preconditions.checkNotNull(lockFactory, "Lock factory should no be null"); + Preconditions.checkArgument( + taskNames != null && !taskNames.isEmpty(), "Invalid task names: null or empty"); + + this.lockFactory = lockFactory; + this.taskNames = taskNames; + } + + @Override + public void open() throws Exception { + super.open(); + this.succeededTaskResultCounterMap = Lists.newArrayListWithExpectedSize(taskNames.size()); + this.failedTaskResultCounterMap = Lists.newArrayListWithExpectedSize(taskNames.size()); + this.lastRunDuration = Lists.newArrayListWithExpectedSize(taskNames.size()); + for (String name : taskNames) { + succeededTaskResultCounterMap.add( + getRuntimeContext() + .getMetricGroup() + .addGroup(TableMaintenanceMetrics.GROUP_KEY, name) + .counter(TableMaintenanceMetrics.SUCCEEDED_TASK_COUNTER)); + failedTaskResultCounterMap.add( + getRuntimeContext() + .getMetricGroup() + .addGroup(TableMaintenanceMetrics.GROUP_KEY, name) + .counter(TableMaintenanceMetrics.FAILED_TASK_COUNTER)); + AtomicLong length = new AtomicLong(0); + lastRunDuration.add(length); + getRuntimeContext() + .getMetricGroup() + .addGroup(TableMaintenanceMetrics.GROUP_KEY, name) + .gauge(TableMaintenanceMetrics.LAST_RUN_DURATION_MS, length::get); + } + + this.lock = lockFactory.createLock(); + this.recoveryLock = lockFactory.createRecoveryLock(); + } + + @Override + public void processElement(StreamRecord<TaskResult> element) { + TaskResult taskResult = element.getValue(); + LOG.debug("Processing task result: {}", taskResult); + long duration = System.currentTimeMillis() - taskResult.startEpoch(); + output.collect( + new StreamRecord<>( + new MaintenanceResult( + taskResult.startEpoch(), + taskResult.taskIndex(), + duration, + taskResult.success(), + taskResult.exceptions()))); + lock.unlock(); + this.lastProcessed = taskResult.startEpoch(); Review Comment: nit: `lastProcessedTaskStartEpoch` might be more clear ########## flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/maintenance/operator/LockRemover.java: ########## @@ -0,0 +1,120 @@ +/* + * 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.iceberg.flink.maintenance.operator; + +import java.util.List; +import java.util.concurrent.atomic.AtomicLong; +import org.apache.flink.annotation.Internal; +import org.apache.flink.metrics.Counter; +import org.apache.flink.streaming.api.operators.AbstractStreamOperator; +import org.apache.flink.streaming.api.operators.OneInputStreamOperator; +import org.apache.flink.streaming.api.watermark.Watermark; +import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** Manages locks and collect {@link org.apache.flink.metrics.Metric} for the Maintenance Tasks. */ +@Internal +public class LockRemover extends AbstractStreamOperator<MaintenanceResult> + implements OneInputStreamOperator<TaskResult, MaintenanceResult> { + private static final Logger LOG = LoggerFactory.getLogger(LockRemover.class); + + private final TriggerLockFactory lockFactory; + private final List<String> taskNames; + + private transient List<Counter> succeededTaskResultCounterMap; Review Comment: remove `Map` from variable names as they are not `Map` anymore. ########## flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/maintenance/operator/LockRemover.java: ########## @@ -0,0 +1,120 @@ +/* + * 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.iceberg.flink.maintenance.operator; + +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicLong; +import org.apache.flink.annotation.Internal; +import org.apache.flink.metrics.Counter; +import org.apache.flink.streaming.api.operators.AbstractStreamOperator; +import org.apache.flink.streaming.api.operators.OneInputStreamOperator; +import org.apache.flink.streaming.api.watermark.Watermark; +import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** Manages locks and collect {@link org.apache.flink.metrics.Metric} for the Maintenance Tasks. */ +@Internal +public class LockRemover extends AbstractStreamOperator<MaintenanceResult> + implements OneInputStreamOperator<TaskResult, MaintenanceResult> { + private static final Logger LOG = LoggerFactory.getLogger(LockRemover.class); + + private final TriggerLockFactory lockFactory; + private final List<String> taskNames; + + private transient Map<Integer, Counter> successfulStreamResultCounterMap; + private transient Map<Integer, Counter> failedStreamResultCounterMap; + private transient Map<Integer, AtomicLong> lastRunLength; + private transient TriggerLockFactory.Lock lock; + private transient TriggerLockFactory.Lock recoveryLock; + private transient long lastProcessed = 0L; + + public LockRemover(TriggerLockFactory lockFactory, List<String> taskNames) { Review Comment: `maintenanceTaskNames` would be more clear to me. ########## flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/maintenance/operator/LockRemover.java: ########## @@ -0,0 +1,120 @@ +/* + * 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.iceberg.flink.maintenance.operator; + +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicLong; +import org.apache.flink.annotation.Internal; +import org.apache.flink.metrics.Counter; +import org.apache.flink.streaming.api.operators.AbstractStreamOperator; +import org.apache.flink.streaming.api.operators.OneInputStreamOperator; +import org.apache.flink.streaming.api.watermark.Watermark; +import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** Manages locks and collect {@link org.apache.flink.metrics.Metric} for the Maintenance Tasks. */ +@Internal +public class LockRemover extends AbstractStreamOperator<MaintenanceResult> + implements OneInputStreamOperator<TaskResult, MaintenanceResult> { + private static final Logger LOG = LoggerFactory.getLogger(LockRemover.class); + + private final TriggerLockFactory lockFactory; + private final List<String> taskNames; + + private transient Map<Integer, Counter> successfulStreamResultCounterMap; + private transient Map<Integer, Counter> failedStreamResultCounterMap; + private transient Map<Integer, AtomicLong> lastRunLength; + private transient TriggerLockFactory.Lock lock; + private transient TriggerLockFactory.Lock recoveryLock; + private transient long lastProcessed = 0L; + + public LockRemover(TriggerLockFactory lockFactory, List<String> taskNames) { + Preconditions.checkNotNull(lockFactory, "Lock factory should no be null"); + Preconditions.checkArgument( + taskNames != null && !taskNames.isEmpty(), "Invalid task names: null or empty"); + + this.lockFactory = lockFactory; + this.taskNames = taskNames; + } + + @Override + public void open() throws Exception { + super.open(); + this.successfulStreamResultCounterMap = Maps.newHashMapWithExpectedSize(taskNames.size()); + this.failedStreamResultCounterMap = Maps.newHashMapWithExpectedSize(taskNames.size()); + this.lastRunLength = Maps.newHashMapWithExpectedSize(taskNames.size()); + for (int i = 0; i < taskNames.size(); ++i) { + String name = taskNames.get(i); + successfulStreamResultCounterMap.put( + i, + getRuntimeContext() + .getMetricGroup() + .addGroup(TableMaintenanceMetrics.GROUP_KEY, name) + .counter(TableMaintenanceMetrics.SUCCESSFUL_STREAM_COUNTER)); + failedStreamResultCounterMap.put( + i, + getRuntimeContext() + .getMetricGroup() + .addGroup(TableMaintenanceMetrics.GROUP_KEY, name) + .counter(TableMaintenanceMetrics.FAILED_STREAM_COUNTER)); + AtomicLong length = new AtomicLong(0); + lastRunLength.put(i, length); + getRuntimeContext() + .getMetricGroup() + .addGroup(TableMaintenanceMetrics.GROUP_KEY, name) + .gauge(TableMaintenanceMetrics.LAST_RUN_LENGTH, length::get); + } + + this.lock = lockFactory.createLock(); + this.recoveryLock = lockFactory.createRecoveryLock(); + } + + @Override + public void processElement(StreamRecord<TaskResult> element) { + TaskResult value = element.getValue(); + LOG.debug("TaskResult {} arrived", value); + long length = System.currentTimeMillis() - value.startEpoch(); + output.collect( + new StreamRecord<>( + new MaintenanceResult( + value.startEpoch(), value.taskId(), length, value.success(), value.exceptions()))); + lock.unlock(); + this.lastProcessed = value.startEpoch(); + + // Update the metrics + lastRunLength.get(value.taskId()).set(length); + if (value.success()) { + successfulStreamResultCounterMap.get(value.taskId()).inc(); + } else { + failedStreamResultCounterMap.get(value.taskId()).inc(); + } + } + + @Override + public void processWatermark(Watermark mark) { + if (mark.getTimestamp() > lastProcessed) { Review Comment: can you add the above context as code comment here and in the `processElement` method? ########## flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/maintenance/operator/TableMaintenanceMetrics.java: ########## @@ -28,6 +28,11 @@ public class TableMaintenanceMetrics { public static final String TRIGGERED = "triggered"; public static final String NOTHING_TO_TRIGGER = "nothingToTrigger"; + // LockRemover metrics + public static final String SUCCEEDED_TASK_COUNTER = "succeededTask"; Review Comment: should be plural like `succeededTasks` ########## flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/maintenance/operator/LockRemover.java: ########## @@ -0,0 +1,120 @@ +/* + * 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.iceberg.flink.maintenance.operator; + +import java.util.List; +import java.util.concurrent.atomic.AtomicLong; +import org.apache.flink.annotation.Internal; +import org.apache.flink.metrics.Counter; +import org.apache.flink.streaming.api.operators.AbstractStreamOperator; +import org.apache.flink.streaming.api.operators.OneInputStreamOperator; +import org.apache.flink.streaming.api.watermark.Watermark; +import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** Manages locks and collect {@link org.apache.flink.metrics.Metric} for the Maintenance Tasks. */ +@Internal +public class LockRemover extends AbstractStreamOperator<MaintenanceResult> + implements OneInputStreamOperator<TaskResult, MaintenanceResult> { + private static final Logger LOG = LoggerFactory.getLogger(LockRemover.class); + + private final TriggerLockFactory lockFactory; + private final List<String> taskNames; + + private transient List<Counter> succeededTaskResultCounterMap; + private transient List<Counter> failedTaskResultCounterMap; + private transient List<AtomicLong> lastRunDuration; Review Comment: nit: why not simple long here as `List<Long>`? I also think `taskLastRunDurationMs` might be a little more clear. -- 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: issues-unsubscr...@iceberg.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For additional commands, e-mail: issues-h...@iceberg.apache.org
