Skip to content

Backport to branch(3) : Improve ExecutorService lifecycle handling by moving shutdown to finally block #3198

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
Nov 20, 2025
Merged

Backport to branch(3) : Improve ExecutorService lifecycle handling by moving shutdown to finally block #3198

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
10 changes: 6 additions & 4 deletions data-loader/core/src/main/java/com/scalar/db/dataloader/core/dataexport/ExportManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ public ExportReport startExport(
ExecutorService executorService =
Executors.newFixedThreadPool(exportOptions.getMaxThreadCount());

BufferedWriter bufferedWriter = new BufferedWriter(writer);
boolean isJson = exportOptions.getOutputFileFormat() == FileFormat.JSON;

try (TransactionManagerCrudOperable.Scanner scanner =
createScanner(exportOptions, dao, manager)) {
createScanner(exportOptions, dao, manager);
BufferedWriter bufferedWriter = new BufferedWriter(writer)) {

Iterator<Result> iterator = scanner.iterator();
AtomicBoolean isFirstBatch = new AtomicBoolean(true);
Expand All @@ -106,18 +106,20 @@ public ExportReport startExport(
executorService.shutdown();
if (executorService.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS)) {
logger.info("All tasks completed");
processFooter(exportOptions, tableMetadata, bufferedWriter);
} else {
logger.error("Timeout occurred while waiting for tasks to complete");
// TODO: handle this
}
processFooter(exportOptions, tableMetadata, bufferedWriter);
} catch (InterruptedException
| IOException
| UnknownTransactionStatusException
| CrudException e) {
logger.error("Error during export: ", e);
} finally {
bufferedWriter.flush();
if (!executorService.isShutdown()) {
executorService.shutdownNow();
}
}
} catch (ExportOptionsValidationException | IOException | ScalarDbDaoException e) {
logger.error("Error during export: {}", e.getMessage());
Expand Down