Issue 32: Garbage collect completed files #29
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ed_files directory parallel to database file or failed_files. In this commit completed files garbage collection is not scheduled, it will execute if DELETE_COMPLETED_FILES configuration set to true. Made changes to consider only those file which are last modified by more than minTimeInMillisToUpdateFile, this reduce risk of reading partially updated files in ingestion.
…-emc/pravega-sensor-collector into garbage-completed-files # Conflicts: # pravega-sensor-collector/src/main/java/io/pravega/sensor/collector/file/FileProcessor.java # pravega-sensor-collector/src/main/java/io/pravega/sensor/collector/util/FileUtils.java # pravega-sensor-collector/src/test/java/io/pravega/sensor/collector/file/FileProcessorTests.java # pravega-sensor-collector/src/test/java/io/pravega/sensor/collector/file/parquet/ParquetEventGeneratorTests.java
pravega-sensor-collector/src/main/java/io/pravega/sensor/collector/file/FileProcessor.java
Outdated
Show resolved
Hide resolved
pravega-sensor-collector/src/main/java/io/pravega/sensor/collector/util/FileUtils.java
Outdated
Show resolved
Hide resolved
pravega-sensor-collector/src/main/java/io/pravega/sensor/collector/file/FileProcessor.java
Outdated
Show resolved
Hide resolved
pravega-sensor-collector/src/main/java/io/pravega/sensor/collector/file/FileProcessor.java
Outdated
Show resolved
Hide resolved
…-emc/pravega-sensor-collector into garbage-completed-files
…mpleted directory. Handled corner case of status got updated to completed but file couldn't move, we are trying to move it again while checking new files.
sachin-j-joshi
requested changes
Dec 12, 2023
pravega-sensor-collector/src/main/java/io/pravega/sensor/collector/file/FileProcessor.java
Outdated
Show resolved
Hide resolved
pravega-sensor-collector/src/main/java/io/pravega/sensor/collector/file/FileProcessor.java
Show resolved
Hide resolved
pravega-sensor-collector/src/main/java/io/pravega/sensor/collector/file/FileConfig.java
Show resolved
Hide resolved
pravega-sensor-collector/src/main/java/io/pravega/sensor/collector/file/FileIngestService.java
Outdated
Show resolved
Hide resolved
pravega-sensor-collector/src/main/java/io/pravega/sensor/collector/file/FileProcessor.java
Show resolved
Hide resolved
pravega-sensor-collector/src/main/java/io/pravega/sensor/collector/util/FileUtils.java
Show resolved
Hide resolved
pravega-sensor-collector/src/main/java/io/pravega/sensor/collector/file/FileProcessor.java
Outdated
Show resolved
Hide resolved
| PRAVEGA_SENSOR_COLLECTOR_RAW1_DELETE_COMPLETED_FILES=false | ||
| PRAVEGA_SENSOR_COLLECTOR_RAW1_TRANSACTION_TIMEOUT_MINUTES=2.0 | ||
| PRAVEGA_SENSOR_COLLECTOR_RAW1_CREATE_SCOPE=false | ||
| PRAVEGA_SENSOR_COLLECTOR_RAW1_MIN_TIME_IN_MILLIS_TO_UPDATE_FILE=5000 |
There was a problem hiding this comment.
Add this param to other file properties
| Files.move(Paths.get(fileEntry.fileName), failedFile, StandardCopyOption.REPLACE_EXISTING); | ||
| log.info("moveFailedFiles: Moved file to {}", failedFile); | ||
| Files.move(sourcePath, targetPath, StandardCopyOption.REPLACE_EXISTING); | ||
| log.info("movedFile: Moved file from {} to {}", sourcePath, targetPath); |
There was a problem hiding this comment.
change log level to debug
shshashwat
reviewed
Dec 12, 2023
| import java.nio.file.*; | ||
| import java.sql.Connection; | ||
| import java.sql.SQLException; |
There was a problem hiding this comment.
can we remove .* and import only the required classes?
| } else { | ||
| try { | ||
| FileUtils.moveCompletedFile(dirFile, movedFilesDirectory); | ||
| log.warn("File: {} already marked as completed, moving now", dirFile.fileName); |
There was a problem hiding this comment.
Yes, This file movement is taken care as it was not succeeded at first time.
ShwethaSNayak
approved these changes
Dec 12, 2023
based on this, I am merging this |
shshashwat
changed the title
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Made changes to consider only those file which are last modified by more than minTimeInMillisToUpdateFile milliseconds, this reduce risk of reading partially updated files in ingestion.
Added garbage collection of completed files by moving it into completed_files directory, parallel to database file or failed_files. In this change completed files garbage collection is not scheduled, it will execute if DELETE_COMPLETED_FILES configuration set to true.
Scheduling of completed files deletion and unit tests will be added in next checkin.
Fixes #32