[clean] Improve collect cleaning consistency #2492
Closed
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
TurboTurtle
changed the title
TurboTurtle
changed the title
Previously, maps were being prepped via archives after extraction. This reduced the amount of file IO being done, but made it so that necessary obfuscations from later archives in a series would not be obfuscated in the archives obfuscated before those later archives were extracted. Fix this by extracting the map prep files into memory for each archive to prep the maps before we enter the obfuscation loop entirely. Closes: sosreport#2490 Related: RHBZ#1930181 Resolves: sosreport#2492 Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
A redundant file skipping check was being executed within `obfuscate_line()` that would cause subsequent archives being obfuscated to skip line obfuscation within a file, despite iterating through the entire file. Remove this redundant check, thus allowing proper obfuscation. Closes: sosreport#2490 Related: RHBZ#1930181 Resolves: sosreport#2492 Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
TurboTurtle
force-pushed
the
collect-consistency-cleaning
branch
from
90e556d
to
32b7337
Compare
pmoravec
approved these changes
Apr 15, 2021
TurboTurtle
added a commit
that referenced
this pull request
Apr 16, 2021
A redundant file skipping check was being executed within `obfuscate_line()` that would cause subsequent archives being obfuscated to skip line obfuscation within a file, despite iterating through the entire file. Remove this redundant check, thus allowing proper obfuscation. Closes: #2490 Related: RHBZ#1930181 Resolves: #2492 Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
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.
This 2-patch set resolves issues surrounding the consistency of
--cleanwhen used withcollect.All subsequent archives from a multi-node
collectshould now be properly cleaned every time, just the sameas the first archive. Additionally, we now more accurately prep our mappings for consistent obfuscation across archives
regardless of which order they are obfuscated in.
Closes: #2490
Related: RHBZ#1930181
Resolves: #2492
Please place an 'X' inside each '[]' to confirm you adhere to our Contributor Guidelines
Closes: #ISSUENUMBERincluded in an independent line?Resolves: #PRNUMBERincluded in an independent line?