pnowojski commented on a change in pull request #17229: URL: https://github.com/apache/flink/pull/17229#discussion_r740119821
########## File path: flink-dstl/flink-dstl-dfs/src/main/java/org/apache/flink/changelog/fs/UploadThrottle.java ########## @@ -0,0 +1,91 @@ +/* + * 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.flink.changelog.fs; + +import org.apache.flink.runtime.io.AvailabilityProvider; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.concurrent.GuardedBy; +import javax.annotation.concurrent.ThreadSafe; + +import java.util.concurrent.CompletableFuture; + +/** Helper class to throttle upload requests when the in-flight data size limit is exceeded. */ +@ThreadSafe Review comment: Per our offline discussion, maybe this could be made thread unsafe, and access to this could be synchronised/protected from `BatchingStateChangeUploader`? ########## File path: flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTask.java ########## @@ -523,11 +534,15 @@ protected void processInput(MailboxDefaultAction.Controller controller) throws E if (!recordWriter.isAvailable()) { timer = new GaugePeriodTimer(ioMetrics.getBackPressuredTimePerSecond()); resumeFuture = recordWriter.getAvailableFuture(); - } else { + } else if (!inputProcessor.isAvailable()) { timer = new ThroughputPeriodTimer( ioMetrics.getIdleTimeMsPerSecond(), throughputCalculator); resumeFuture = inputProcessor.getAvailableFuture(); + } else { + // todo: add new metrics (FLINK-23486) + timer = new GaugePeriodTimer(ioMetrics.getBackPressuredTimePerSecond()); + resumeFuture = changelogWriterAvailabilityProvider.getAvailableFuture(); Review comment: For the sake of simplicity, in this PR and in the MVP maybe it would be best to account time when changelog/state backend is not available as `busy`? This would be easier to implement as it would naturally account consistently waiting on the availability future and on `lock.wait();`. ########## File path: flink-dstl/flink-dstl-dfs/src/main/java/org/apache/flink/changelog/fs/UploadThrottle.java ########## @@ -0,0 +1,91 @@ +/* + * 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.flink.changelog.fs; + +import org.apache.flink.runtime.io.AvailabilityProvider; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.concurrent.GuardedBy; +import javax.annotation.concurrent.ThreadSafe; + +import java.util.concurrent.CompletableFuture; + +/** Helper class to throttle upload requests when the in-flight data size limit is exceeded. */ +@ThreadSafe +class UploadThrottle implements AvailabilityProvider { + private static final Logger LOG = LoggerFactory.getLogger(UploadThrottle.class); + + private final Object lock = new Object(); + private final long maxBytesInFlight; + + @GuardedBy("lock") + private long inFlightBytesCounter = 0; + + @GuardedBy("lock") + private CompletableFuture<?> availabilityFuture = AvailabilityProvider.AVAILABLE; + + UploadThrottle(long maxBytesInFlight) { + this.maxBytesInFlight = maxBytesInFlight; + } + + /** + * Seize <b>bytes</b> capacity, waiting if needed. Called by the Task thread. + * + * @throws InterruptedException + */ + public void seizeCapacity(long bytes) throws InterruptedException { + synchronized (lock) { + while (!hasCapacity()) { + LOG.info("In flight data size threshold exceeded: {}", maxBytesInFlight); + lock.wait(); + } Review comment: If we want to go with this backpressured metric this code should be probably wrapped with ``` backPressuredTimeMsPerSecond.markStart(); (...) backPressuredTimeMsPerSecond.markEnd(); ``` ########## File path: flink-dstl/flink-dstl-dfs/src/main/java/org/apache/flink/changelog/fs/UploadThrottle.java ########## @@ -0,0 +1,91 @@ +/* + * 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.flink.changelog.fs; + +import org.apache.flink.runtime.io.AvailabilityProvider; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.concurrent.GuardedBy; +import javax.annotation.concurrent.ThreadSafe; + +import java.util.concurrent.CompletableFuture; + +/** Helper class to throttle upload requests when the in-flight data size limit is exceeded. */ +@ThreadSafe +class UploadThrottle implements AvailabilityProvider { + private static final Logger LOG = LoggerFactory.getLogger(UploadThrottle.class); + + private final Object lock = new Object(); + private final long maxBytesInFlight; + + @GuardedBy("lock") + private long inFlightBytesCounter = 0; + + @GuardedBy("lock") + private CompletableFuture<?> availabilityFuture = AvailabilityProvider.AVAILABLE; + + UploadThrottle(long maxBytesInFlight) { + this.maxBytesInFlight = maxBytesInFlight; + } + + /** + * Seize <b>bytes</b> capacity, waiting if needed. Called by the Task thread. + * + * @throws InterruptedException + */ + public void seizeCapacity(long bytes) throws InterruptedException { + synchronized (lock) { + while (!hasCapacity()) { + LOG.info("In flight data size threshold exceeded: {}", maxBytesInFlight); + lock.wait(); + } + inFlightBytesCounter += bytes; + if (!hasCapacity() && isAvailable()) { + availabilityFuture = new CompletableFuture<>(); + } + } + } + + /** + * Release capacity, signalling waiting threads, if any. Called by {@link + * BatchingStateChangeUploader} (IO thread). + */ + public void releaseCapacity(long bytes) { + synchronized (lock) { + inFlightBytesCounter -= bytes; + if (hasCapacity() && !isAvailable()) { + availabilityFuture.complete(null); Review comment: complete it outside of the lock? -- 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]
