-
Notifications
You must be signed in to change notification settings - Fork 10
bugs #15608 fix: big objects implicit 2GB limitation #104
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.
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
Open
Regzox
wants to merge
1
commit into
master
Choose a base branch
from
ticket_15561
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or 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
131 changes: 131 additions & 0 deletions
131
sedalib/src/main/java/fr/gouv/vitam/tools/sedalib/utils/digest/DigestProgressLogger.java
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| /** | ||
| * Copyright French Prime minister Office/DINSIC/Vitam Program (2015-2019) | ||
| * <p> | ||
| * contact.vitam@programmevitam.fr | ||
| * <p> | ||
| * This software is developed as a validation helper tool, for constructing Submission Information Packages (archives | ||
| * sets) in the Vitam program whose purpose is to implement a digital archiving back-office system managing high | ||
| * volumetry securely and efficiently. | ||
| * <p> | ||
| * This software is governed by the CeCILL 2.1 license under French law and abiding by the rules of distribution of free | ||
| * software. You can use, modify and/ or redistribute the software under the terms of the CeCILL 2.1 license as | ||
| * circulated by CEA, CNRS and INRIA archiveTransfer the following URL "http://www.cecill.info". | ||
| * <p> | ||
| * As a counterpart to the access to the source code and rights to copy, modify and redistribute granted by the license, | ||
| * users are provided only with a limited warranty and the software's author, the holder of the economic rights, and the | ||
| * successive licensors have only limited liability. | ||
| * <p> | ||
| * In this respect, the user's attention is drawn to the risks associated with loading, using, modifying and/or | ||
| * developing or reproducing the software by the user in light of its specific status of free software, that may mean | ||
| * that it is complicated to manipulate, and that also therefore means that it is reserved for developers and | ||
| * experienced professionals having in-depth computer knowledge. Users are therefore encouraged to load and test the | ||
| * software's suitability as regards their requirements in conditions enabling the security of their systems and/or data | ||
| * to be ensured and, more generally, to use and operate it in the same conditions as regards security. | ||
| * <p> | ||
| * The fact that you are presently reading this means that you have had knowledge of the CeCILL 2.1 license and that you | ||
| * accept its terms. | ||
| */ | ||
| package fr.gouv.vitam.tools.sedalib.utils.digest; | ||
|
|
||
| import fr.gouv.vitam.tools.sedalib.utils.SEDALibProgressLogger; | ||
| import org.apache.commons.io.FileUtils; | ||
|
|
||
| import java.nio.file.Path; | ||
|
|
||
| import static fr.gouv.vitam.tools.sedalib.utils.SEDALibProgressLogger.GLOBAL; | ||
| import static fr.gouv.vitam.tools.sedalib.utils.SEDALibProgressLogger.doProgressLogWithoutInterruption; | ||
|
|
||
| /** | ||
| * Common logging logic for digest computation. | ||
| */ | ||
| public class DigestProgressLogger { | ||
|
|
||
| private static final long LOGGING_THRESHOLD_BYTES = 20L * FileUtils.ONE_MB; | ||
| private static final long LOG_INTERVAL_MS = 3_000; | ||
|
|
||
| private final SEDALibProgressLogger logger; | ||
| private final String filename; | ||
| private final long fileSize; | ||
| private final boolean enabled; | ||
|
|
||
| private long lastLogTimestamp; | ||
|
|
||
| public DigestProgressLogger( | ||
| SEDALibProgressLogger logger, | ||
| Path path, | ||
| long fileSize | ||
| ) { | ||
| this.logger = logger; | ||
| this.filename = extractFilename(path); | ||
| this.fileSize = fileSize; | ||
| this.enabled = logger != null && fileSize > LOGGING_THRESHOLD_BYTES; | ||
| this.lastLogTimestamp = System.currentTimeMillis(); | ||
|
|
||
| if (enabled) { | ||
| log(0); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Logs progress based on total bytes read. | ||
| */ | ||
| public void logProgress(long bytesReadTotal) { | ||
| if (!enabled || !shouldLogNow()) { | ||
| return; | ||
| } | ||
|
|
||
| log(bytesReadTotal); | ||
| } | ||
|
|
||
| public void logEnd() { | ||
| if (!enabled) { | ||
| return; | ||
| } | ||
|
|
||
| log(fileSize); | ||
| } | ||
|
|
||
| private boolean shouldLogNow() { | ||
| long now = System.currentTimeMillis(); | ||
| if (now - lastLogTimestamp >= LOG_INTERVAL_MS) { | ||
| lastLogTimestamp = now; | ||
| return true; | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| private void log(long bytesRead) { | ||
| doProgressLogWithoutInterruption( | ||
| logger, | ||
| GLOBAL, | ||
| formatMessage(bytesRead), | ||
| null | ||
| ); | ||
| } | ||
|
|
||
| private String formatMessage(long bytesRead) { | ||
| int percent = computePercent(bytesRead); | ||
|
|
||
| return String.format( | ||
| "digest %s %s/%s (%d%%)", | ||
| filename, | ||
| FileUtils.byteCountToDisplaySize(bytesRead), | ||
| FileUtils.byteCountToDisplaySize(fileSize), | ||
| percent | ||
| ); | ||
| } | ||
|
|
||
| private int computePercent(long bytesReadTotal) { | ||
| if (fileSize <= 0) { | ||
| return 100; | ||
| } | ||
| long percent = (bytesReadTotal * 100L) / fileSize; | ||
| return (int) Math.min(percent, 100); | ||
| } | ||
|
|
||
| private static String extractFilename(Path path) { | ||
| return (path != null && path.getFileName() != null) | ||
| ? path.getFileName().toString() | ||
| : "inconnu"; | ||
| } | ||
| } |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.