Clear shared files map upon flush #513
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
csegarragonz
commented
Oct 20, 2021
| @@ -47,21 +51,39 @@ TEST_CASE_METHOD(FlushingTestFixture, | |||
| "Test flushing clears shared files", | |||
| "[flush]") | |||
| { | |||
| std::string relativePath = "flush-test.txt"; | |||
There was a problem hiding this comment.
I refactor the test to use the FileLoader API rather than modify the host filesystem manually.
csegarragonz
commented
Oct 20, 2021
| REQUIRE(storage::SharedFiles::syncSharedFile(syncSharedPath, "") == 0); | ||
| std::string realPath = | ||
| storage::SharedFiles::realPathForSharedFile(syncSharedPath); | ||
| REQUIRE(::open(realPath.c_str(), O_RDONLY) > 0); |
There was a problem hiding this comment.
This is the check that would fail without the patch, returning a fd of -1.
csegarragonz
commented
Oct 20, 2021
| @@ -115,7 +115,6 @@ TEST_CASE_METHOD(FileLoaderTestFixture, | |||
| REQUIRE(boost::filesystem::exists(funcFile)); | |||
|
|
|||
| // Now flush | |||
| storage::FileLoader& loader = storage::getFileLoader(); | |||
There was a problem hiding this comment.
Found this, and thought I'd commit the change as well.
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.
Previously we were not clearing the
SharedFilesmap upon flush. As a consequence, when opening a shared file that had been (1) synced, and (2) flushed, the filesystem implementation would act as if the file was cached, and try to::openit.In more detail,
SharedFiles::syncSharedFilewould not sync back the file after flush.This PR fixes it and adds a regression test.