DM-31255: Fix log-to-butler failures with --skip-existing #132
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
Add special logic to detect cases when we don't want to save log records to butler. Removes temporary file in that case or when ingest does not work. When ingest is not supported we now store an empty records object to make sure that dataset exists for consistency with other cases.
timj
reviewed
Jul 29, 2021
| " datastore can not ingest files, empty record list is stored instead.") | ||
| records = ButlerLogRecords.from_records([]) | ||
| butler.put(records, ref[0]) | ||
| # And remove the file, but ignore errors |
There was a problem hiding this comment.
Could maybe put this removal in a finally clause.
timj
approved these changes
Jul 29, 2021
timj
reviewed
Jul 29, 2021
| @@ -450,6 +465,15 @@ def writeLogRecords(self, quantum, taskDef, butler): | |||
| # Remove the handler so we stop accumulating log messages. | |||
| logging.getLogger().removeHandler(self.log_handler) | |||
|
|
|||
| if not store: | |||
| # do not store anything but remove file | |||
| if filename is not None: | |||
There was a problem hiding this comment.
what about:
if store and other tests:
# store it
if filename:
# remove itwould work wouldn't it? Then there would not be the os.remove code duplication logic.
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.
Add special logic to detect cases when we don't want to save log records
to butler. Removes temporary file in that case or when ingest does not
work. When ingest is not supported we now store an empty records object
to make sure that dataset exists for consistency with other cases.
Checklist
doc/changes