Skip to content

[FLINK-36838][state] Join background threads when ForSt state backend quit #25732

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
Zakelly merged 2 commits into from
Dec 4, 2024
Merged

[FLINK-36838][state] Join background threads when ForSt state backend quit #25732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b66c90c
[FLINK-36838][state] Join background threads when ForSt state backend…
Zakelly Dec 3, 2024
e0c7582
[hotfix] Use `FlinkEnv` in tests for ForStStateBackend
Zakelly Dec 3, 2024
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
15 changes: 14 additions & 1 deletion ...statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStResourceContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import org.forstdb.FlinkEnv;
import org.forstdb.IndexType;
import org.forstdb.PlainTableConfig;
import org.forstdb.Priority;
import org.forstdb.ReadOptions;
import org.forstdb.Statistics;
import org.forstdb.TableFormatConfig;
Expand Down Expand Up @@ -76,6 +77,8 @@ public final class ForStResourceContainer implements AutoCloseable {
// the filename length limit is 255 on most operating systems
private static final int INSTANCE_PATH_LENGTH_LIMIT = 255 - FORST_RELOCATE_LOG_SUFFIX.length();

@Nullable private FlinkEnv flinkEnv = null;

@Nullable private final Path remoteBasePath;

@Nullable private final Path remoteForStPath;
Expand Down Expand Up @@ -187,7 +190,8 @@ public DBOptions getDbOptions() {
// configured,
// fallback to local directory currently temporarily.
if (remoteForStPath != null) {
opt.setEnv(new FlinkEnv(remoteForStPath.toString(), forstFileSystem));
flinkEnv = new FlinkEnv(remoteForStPath.toString(), forstFileSystem);
opt.setEnv(flinkEnv);
}

return opt;
Expand Down Expand Up @@ -408,6 +412,15 @@ public void close() throws Exception {
sharedResources.close();
}
cleanRelocatedDbLogs();
if (flinkEnv != null) {
// There is something wrong with the FlinkEnv, the background threads won't quit during
// the disposal of DB. We explicit shrink the thread pool here until the ForSt repo
// fixes that.
flinkEnv.setBackgroundThreads(0, Priority.LOW);
flinkEnv.setBackgroundThreads(0, Priority.HIGH);
flinkEnv.close();
flinkEnv = null;
}
}

/**
Expand Down
5 changes: 2 additions & 3 deletions .../state/forst/ForStStateBackendTestV2.java → .../state/forst/ForStStateBackendV2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

/** Tests for the async keyed state backend part of {@link ForStStateBackend}. */
@ExtendWith(ParameterizedTestExtension.class)
class ForStStateBackendTestV2 extends StateBackendTestV2Base<ForStStateBackend> {
class ForStStateBackendV2Test extends StateBackendTestV2Base<ForStStateBackend> {

@TempDir private static java.nio.file.Path tempFolder;
@TempDir private static java.nio.file.Path tempFolderForForStLocal;
Expand Down Expand Up @@ -94,7 +94,6 @@ protected ConfigurableStateBackend getStateBackend() throws Exception {
if (hasRemoteDir) {
config.set(REMOTE_DIRECTORY, tempFolderForForstRemote.toString());
}
backend.configure(config, Thread.currentThread().getContextClassLoader());
return new ForStStateBackend();
return backend.configure(config, Thread.currentThread().getContextClassLoader());
}
}