Skip to content

[FLINK-23003][runtime] Fix resource leak in RocksIncrementalSnapshotStrategy #16168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 17, 2021
Merged

[FLINK-23003][runtime] Fix resource leak in RocksIncrementalSnapshotStrategy #16168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...ksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBKeyedStateBackend.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,7 @@ public void dispose() {

cleanInstanceBasePath();
}
IOUtils.closeQuietly(checkpointSnapshotStrategy);
this.disposed = true;
}

Expand Down
3 changes: 2 additions & 1 deletion ...c/main/java/org/apache/flink/contrib/streaming/state/RocksDBKeyedStateBackendBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ public RocksDBKeyedStateBackend<K> build() throws BackendBuildingException {
new RocksDbTtlCompactFiltersManager(ttlTimeProvider);

ResourceGuard rocksDBResourceGuard = new ResourceGuard();
RocksDBSnapshotStrategyBase<K, ?> checkpointStrategy;
RocksDBSnapshotStrategyBase<K, ?> checkpointStrategy = null;
PriorityQueueSetFactory priorityQueueFactory;
SerializedCompositeKeyBuilder<K> sharedRocksKeyBuilder;
// Number of bytes required to prefix the key groups.
Expand Down Expand Up @@ -363,6 +363,7 @@ public RocksDBKeyedStateBackend<K> build() throws BackendBuildingException {
IOUtils.closeQuietly(optionsContainer);
ttlCompactFiltersManager.disposeAndClearRegisteredCompactionFactories();
kvStateInformation.clear();
IOUtils.closeQuietly(checkpointStrategy);
try {
FileUtils.deleteDirectory(instanceBasePath);
} catch (Exception ex) {
Expand Down
5 changes: 4 additions & 1 deletion ...n/java/org/apache/flink/contrib/streaming/state/snapshot/RocksDBSnapshotStrategyBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
* @param <K> type of the backend keys.
*/
public abstract class RocksDBSnapshotStrategyBase<K, R extends SnapshotResources>
implements CheckpointListener, SnapshotStrategy<KeyedStateHandle, R> {
implements CheckpointListener, SnapshotStrategy<KeyedStateHandle, R>, AutoCloseable {

private static final Logger LOG = LoggerFactory.getLogger(RocksDBSnapshotStrategyBase.class);

Expand Down Expand Up @@ -92,4 +92,7 @@ public RocksDBSnapshotStrategyBase(
public String getDescription() {
return description;
}

@Override
public abstract void close();
}
5 changes: 5 additions & 0 deletions ...ain/java/org/apache/flink/contrib/streaming/state/snapshot/RocksFullSnapshotStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,11 @@ public void notifyCheckpointAborted(long checkpointId) {
// nothing to do.
}

@Override
public void close() {
// nothing to do.
}

private SupplierWithException<CheckpointStreamWithResultProvider, Exception>
createCheckpointStreamSupplier(
long checkpointId,
Expand Down
5 changes: 5 additions & 0 deletions ...a/org/apache/flink/contrib/streaming/state/snapshot/RocksIncrementalSnapshotStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,11 @@ public void notifyCheckpointAborted(long abortedCheckpointId) {
}
}

@Override
public void close() {
stateUploader.close();
}

@Nonnull
private SnapshotDirectory prepareLocalSnapshotDirectory(long checkpointId) throws IOException {

Expand Down