RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5920 from caibo2014/fix-tool-bug

Browse Source 
tools: ceph_monstore_tool: remove the output file when get map fails

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2015-09-17 17:09:18 +08:00
commit 3045168f0a
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/ceph_monstore_tool.cc
View File

@ -12,6 +12,7 @@
*/
#include <boost/program_options/variables_map.hpp>
#include <boost/program_options/parsers.hpp>
#include <boost/scope_exit.hpp>
#include <stdlib.h>
#include <string>
@ -600,6 +601,13 @@ int main(int argc, char **argv) {
}
}
BOOST_SCOPE_EXIT((&r) (&fd) (&outpath)) {
::close(fd);
if (r < 0 && fd != STDOUT_FILENO) {
::remove(outpath.c_str());
}
} BOOST_SCOPE_EXIT_END
bufferlist bl;
r = 0;
if (map_type == "osdmap") {
@ -610,7 +618,6 @@ int main(int argc, char **argv) {
if (r < 0) {
std::cerr << "Error getting map: " << cpp_strerror(r) << std::endl;
err = EINVAL;
::close(fd);
goto done;
}
bl.write_fd(fd);