L0 ingest issues (both shiny and repro V) #252
Merged
Conversation
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
jeanconn
commented
Dec 18, 2020
| db.insert(arch_info, 'archfiles') | ||
| count_inserted += 1 | ||
| db.commit() | ||
| db.commit() |
There was a problem hiding this comment.
It is less efficient here to commit after each insert, but the "move_archive_files" routine needs a lock on the db and it can't do that if there are uncommited inserts.
taldcroft
approved these changes
Dec 18, 2020
mica/archive/aca_l0.py
Outdated
| @@ -739,7 +737,7 @@ def _fetch_individual_files(self, files): | |||
| fetched_files = [] | |||
| ingest_dates = [] | |||
| # get the files, store in file archive, and record in database | |||
| for file in files: | |||
| for i, file in enumerate(files): | |||
There was a problem hiding this comment.
I don't see a dependence on the new i.
There was a problem hiding this comment.
Good point. I can cut that. I was using it for extra debugging when troubleshooting.
This was referenced Jan 4, 2021
Merged
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.
Description
Fix some L0 ingest hiccups.
The ingest code was failing to ingest single new files in Repro. It looks like that was due to a bug in identifying new files that had been downloaded. I also hit a db locking issue that was improved by reorganizing. And while at it, I updated the pieces needed to make a new archive (of the list of files released.. the "cda" h5 piece) to work more happily with shiny (removed six, updated some urllib pieces). I was not rigorous distinguishing reproV from shiny updates here as I have just been working in shiny.
Testing