Fixed bug with the Catalogue AsynchronousSaver #2621
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
johnhaddon
requested changes
Jun 20, 2018
src/GafferImage/Catalogue.cpp
Outdated
| // the saving will eventually error, so we return null instead. | ||
| // Its likely this only occurs while the node is in the process | ||
| // of being deleted (perhaps inside python's garbage collector). | ||
| if( !client->ancestor<ScriptNode>() && Context::hasSubstitutions( fileName ) ) |
There was a problem hiding this comment.
I think this would be better done in generateFileName() itself, so the fix applies everywhere it might be used, and so AsynchronousSaver doesn't need to know anything at all about how the filename is generated. generateFileName() can just return "" in this case, and then we'll hit the existing early-out above.
andrewkaufman
force-pushed
the
catalogueLifetime
branch
2 times, most recently
from
7ef6f3e
to
724ac59
Compare
|
I squashed that change in and rebased on master |
andrewkaufman
force-pushed
the
catalogueLifetime
branch
from
724ac59
to
77cb07d
Compare
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.
I experienced this issue during my documentation revamp, where the screengrab app is now loading multiple scripts which use Catalogues, all within a single session. A Catalogue which had been removed from the script was still trying to save images, despite the file it wanted to write being dependent on the script variables. We now prevent saving in this obscure case.
Note that while I didn't change
CatalogueTest.testDeleteBeforeSaveCompleteshere, as best I can tell it isn't doing what it claims. The async save happens so quickly that the save completes before the catalogue is deleted (confirmed via prints inside the saver), so I've taken an alternate approach in my new test case.