rec: delete temp file on failure to dump RPZ file #15033
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
miodvallat
approved these changes
Jan 13, 2025
pdns/recursordist/rpzloader.cc
Outdated
| SLOG(g_log << Logger::Warning << "Error while moving the content of the RPZ zone " << zoneName << " to the dump file: " << stringerror() << endl, | ||
| logger->error(Logr::Error, errno, "Error while moving the content of the RPZ", "destination_file", Logging::Loggable(dumpZoneFileName))); | ||
| return false; | ||
| } | ||
|
|
||
| tempFile->clear(); // file is renamed, no need to unlink |
There was a problem hiding this comment.
Suggested change
| tempFile->clear(); // file is renamed, no need to unlink | |
| tempFile->clear(); // file has been renamed, no need to unlink |
rgacogne
reviewed
Jan 13, 2025
| std::string temp = dumpZoneFileName + "XXXXXX"; | ||
| int fileDesc = mkstemp(&temp.at(0)); | ||
| auto tempFile = UniqueFilenameDeleterPtr(new string(dumpZoneFileName + "XXXXXX")); | ||
| int fileDesc = mkstemp(tempFile->data()); | ||
| if (fileDesc < 0) { | ||
| SLOG(g_log << Logger::Warning << "Unable to open a file to dump the content of the RPZ zone " << zoneName << endl, | ||
| logger->error(Logr::Error, errno, "Unable to create temporary file")); |
There was a problem hiding this comment.
It might make sense to clear the filename in this case as well, because we know it doesn't exist yet.
omoerbeek
force-pushed
the
rec-rpz-tmp-file-deleter
branch
from
15b0e4e to
a472992
Compare
Pull Request Test Coverage Report for Build 12750666660Details
💛 - Coveralls |
omoerbeek
force-pushed
the
rec-rpz-tmp-file-deleter
branch
from
10a3c02 to
9817dc5
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.
Short description
Checklist
I have: