Attachment #895145 for bug #932251

View | Details | Raw Unified | Return to bug 932251 | Differences between
Collapse All | Expand All




++ b/src/mongo/db/initialize_server_global_state.cpp     2024-06-05 01:07:27.035053336 -0700

#include "mongo/db/initialize_server_global_state.h"
#include "mongo/db/initialize_server_global_state_gen.h"

#include <boost/filesystem.hpp>
#include <fmt/format.h>
#include <iostream>
#include <memory>

                                            << "\" should name a file, not a directory.");
            }

            if (!serverGlobalParams.logAppend && boost::filesystem::is_regular_file(absoluteLogpath)) {
                std::string renameTarget = absoluteLogpath + "." + terseCurrentTime(false);
                boost::system::error_code ec;
                boost::filesystem::rename(absoluteLogpath, renameTarget, ec);
++ b/src/mongo/db/startup_warnings_mongod.cpp     2024-06-05 01:09:36.740158960 -0700

#include "mongo/db/startup_warnings_mongod.h"

#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/exception.hpp>
#include <fstream>
#ifndef _WIN32
#include <sys/resource.h>
++ b/src/mongo/db/storage/storage_engine_lock_file_posix.cpp     2024-06-05 00:47:33.178731500 -0700

    // if called without a fully qualified path it asserts; that makes mongoperf fail.
    // so make a warning. need a better solution longer term.
    // massert(40389, str::stream() << "Couldn't find parent dir for file: " << file.string(),);
    if (!file.has_parent_path()) {
        LOGV2(22274,
              "warning flushMyDirectory couldn't find parent dir for file: {file}",
              "flushMyDirectory couldn't find parent dir for file",

    }


    boost::filesystem::path dir = file.parent_path();  // parent_path in new boosts

    LOGV2_DEBUG(22275, 1, "flushing directory {dir_string}", "dir_string"_attr = dir.string());
++ b/src/mongo/db/storage/storage_engine_metadata.cpp     2024-06-05 01:26:46.904273382 -0700

    // if called without a fully qualified path it asserts; that makes mongoperf fail.
    // so make a warning. need a better solution longer term.
    // massert(13652, str::stream() << "Couldn't find parent dir for file: " << file.string(),);
    if (!file.has_parent_path()) {
        LOGV2(22283,
              "warning flushMyDirectory couldn't find parent dir for file: {file}",
              "flushMyDirectory couldn't find parent dir for file",

    }


    boost::filesystem::path dir = file.parent_path();  // parent_path in new boosts

    LOGV2_DEBUG(22284, 1, "flushing directory {dir_string}", "dir_string"_attr = dir.string());
++ b/src/mongo/shell/shell_utils_launcher.cpp     2024-06-05 01:29:45.140048809 -0700

#include <boost/iostreams/stream.hpp>
#include <boost/iostreams/stream_buffer.hpp>
#include <boost/iostreams/tee.hpp>
#include <boost/filesystem.hpp>
#include <cctype>
#include <fcntl.h>
#include <fmt/format.h>

    boost::filesystem::directory_iterator i(from);
    while (i != end) {
        boost::filesystem::path p = *i;
        if (p.filename() == "metrics.interim" || p.filename() == "metrics.interim.temp") {
            // Ignore any errors for metrics.interim* files as these may disappear during copy
            boost::system::error_code ec;
            boost::filesystem::copy_file(p, to / p.filename(), ec);
            if (ec) {
                LOGV2_INFO(22814,
                           "Skipping copying of file from '{from}' to "
                           "'{to}' due to: {error}",
                           "Skipping copying of file due to error"
                           "from"_attr = p.generic_string(),
                           "to"_attr = (to / p.filename()).generic_string(),
                           "error"_attr = ec.message());
            }
        } else if (p.filename() != "mongod.lock" && p.filename() != "WiredTiger.lock") {
            if (boost::filesystem::is_directory(p)) {
                boost::filesystem::path newDir = to / p.filename();
                boost::filesystem::create_directory(newDir);
                copyDir(p, newDir);
            } else {
                boost::filesystem::copy_file(p, to / p.filename());
            }
        }
        ++i;
++ b/src/mongo/scripting/engine.cpp     2024-06-05 00:59:57.488909335 -0700

#include "mongo/scripting/engine.h"

#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/directory.hpp>
#include <cctype>

#include "mongo/client/dbclient_base.h"
++ b/src/mongo/shell/shell_utils_launcher.h     2024-06-05 01:04:44.286162623 -0700


#pragma once

#include <boost/filesystem/path.hpp>
#include <map>
#include <sstream>
#include <string>

Return to bug 932251

Line Link Here

(-)file_not_specified_in_diff (-20 / +23 lines)
0	-- a/src/mongo/db/initialize_server_global_state.cpp 2024-02-13 00:46:45.000000000 -0800	0	++ b/src/mongo/db/initialize_server_global_state.cpp 2024-06-05 01:07:27.035053336 -0700
Lines 34-40 Link Here
34	#include "mongo/db/initialize_server_global_state.h"	34	#include "mongo/db/initialize_server_global_state.h"
35	#include "mongo/db/initialize_server_global_state_gen.h"	35	#include "mongo/db/initialize_server_global_state_gen.h"
36		36
37	#include <boost/filesystem/operations.hpp>	37	#include <boost/filesystem.hpp>
38	#include <fmt/format.h>	38	#include <fmt/format.h>
39	#include <iostream>	39	#include <iostream>
40	#include <memory>	40	#include <memory>
Lines 346-352 Link Here
346	<< "\" should name a file, not a directory.");	346	<< "\" should name a file, not a directory.");
347	}	347	}
348		348
349	if (!serverGlobalParams.logAppend && boost::filesystem::is_regular(absoluteLogpath)) {	349	if (!serverGlobalParams.logAppend && boost::filesystem::is_regular_file(absoluteLogpath)) {
350	std::string renameTarget = absoluteLogpath + "." + terseCurrentTime(false);	350	std::string renameTarget = absoluteLogpath + "." + terseCurrentTime(false);
351	boost::system::error_code ec;	351	boost::system::error_code ec;
352	boost::filesystem::rename(absoluteLogpath, renameTarget, ec);	352	boost::filesystem::rename(absoluteLogpath, renameTarget, ec);
353	-- a/src/mongo/db/startup_warnings_mongod.cpp 2024-02-13 00:46:45.000000000 -0800	353	++ b/src/mongo/db/startup_warnings_mongod.cpp 2024-06-05 01:09:36.740158960 -0700
Lines 34-39 Link Here
34	#include "mongo/db/startup_warnings_mongod.h"	34	#include "mongo/db/startup_warnings_mongod.h"
35		35
36	#include <boost/filesystem/operations.hpp>	36	#include <boost/filesystem/operations.hpp>
		37	#include <boost/filesystem/exception.hpp>
37	#include <fstream>	38	#include <fstream>
38	#ifndef _WIN32	39	#ifndef _WIN32
39	#include <sys/resource.h>	40	#include <sys/resource.h>
40	-- a/src/mongo/db/storage/storage_engine_lock_file_posix.cpp 2024-06-05 00:46:38.374648451 -0700	41	++ b/src/mongo/db/storage/storage_engine_lock_file_posix.cpp 2024-06-05 00:47:33.178731500 -0700
Lines 55-61 Link Here
55	// if called without a fully qualified path it asserts; that makes mongoperf fail.	55	// if called without a fully qualified path it asserts; that makes mongoperf fail.
56	// so make a warning. need a better solution longer term.	56	// so make a warning. need a better solution longer term.
57	// massert(40389, str::stream() << "Couldn't find parent dir for file: " << file.string(),);	57	// massert(40389, str::stream() << "Couldn't find parent dir for file: " << file.string(),);
58	if (!file.has_branch_path()) {	58	if (!file.has_parent_path()) {
59	LOGV2(22274,	59	LOGV2(22274,
60	"warning flushMyDirectory couldn't find parent dir for file: {file}",	60	"warning flushMyDirectory couldn't find parent dir for file: {file}",
61	"flushMyDirectory couldn't find parent dir for file",	61	"flushMyDirectory couldn't find parent dir for file",
Lines 64-70 Link Here
64	}	64	}
65		65
66		66
67	boost::filesystem::path dir = file.branch_path(); // parent_path in new boosts	67	boost::filesystem::path dir = file.parent_path(); // parent_path in new boosts
68		68
69	LOGV2_DEBUG(22275, 1, "flushing directory {dir_string}", "dir_string"_attr = dir.string());	69	LOGV2_DEBUG(22275, 1, "flushing directory {dir_string}", "dir_string"_attr = dir.string());
70	-- a/src/mongo/db/storage/storage_engine_metadata.cpp 2024-02-13 00:46:45.000000000 -0800	70	++ b/src/mongo/db/storage/storage_engine_metadata.cpp 2024-06-05 01:26:46.904273382 -0700
Lines 220-226 Link Here
220	// if called without a fully qualified path it asserts; that makes mongoperf fail.	220	// if called without a fully qualified path it asserts; that makes mongoperf fail.
221	// so make a warning. need a better solution longer term.	221	// so make a warning. need a better solution longer term.
222	// massert(13652, str::stream() << "Couldn't find parent dir for file: " << file.string(),);	222	// massert(13652, str::stream() << "Couldn't find parent dir for file: " << file.string(),);
223	if (!file.has_branch_path()) {	223	if (!file.has_parent_path()) {
224	LOGV2(22283,	224	LOGV2(22283,
225	"warning flushMyDirectory couldn't find parent dir for file: {file}",	225	"warning flushMyDirectory couldn't find parent dir for file: {file}",
226	"flushMyDirectory couldn't find parent dir for file",	226	"flushMyDirectory couldn't find parent dir for file",
Lines 229-235 Link Here
229	}	229	}
230		230
231		231
232	boost::filesystem::path dir = file.branch_path(); // parent_path in new boosts	232	boost::filesystem::path dir = file.parent_path(); // parent_path in new boosts
233		233
234	LOGV2_DEBUG(22284, 1, "flushing directory {dir_string}", "dir_string"_attr = dir.string());	234	LOGV2_DEBUG(22284, 1, "flushing directory {dir_string}", "dir_string"_attr = dir.string());
235	-- a/src/mongo/shell/shell_utils_launcher.cpp 2024-02-13 00:46:45.000000000 -0800	235	++ b/src/mongo/shell/shell_utils_launcher.cpp 2024-06-05 01:29:45.140048809 -0700
Lines 39-44 Link Here
39	#include <boost/iostreams/stream.hpp>	39	#include <boost/iostreams/stream.hpp>
40	#include <boost/iostreams/stream_buffer.hpp>	40	#include <boost/iostreams/stream_buffer.hpp>
41	#include <boost/iostreams/tee.hpp>	41	#include <boost/iostreams/tee.hpp>
		42	#include <boost/filesystem.hpp>
42	#include <cctype>	43	#include <cctype>
43	#include <fcntl.h>	44	#include <fcntl.h>
44	#include <fmt/format.h>	45	#include <fmt/format.h>
Lines 907-932 Link Here
907	boost::filesystem::directory_iterator i(from);	908	boost::filesystem::directory_iterator i(from);
908	while (i != end) {	909	while (i != end) {
909	boost::filesystem::path p = *i;	910	boost::filesystem::path p = *i;
910	if (p.leaf() == "metrics.interim" \|\| p.leaf() == "metrics.interim.temp") {	911	if (p.filename() == "metrics.interim" \|\| p.filename() == "metrics.interim.temp") {
911	// Ignore any errors for metrics.interim* files as these may disappear during copy	912	// Ignore any errors for metrics.interim* files as these may disappear during copy
912	boost::system::error_code ec;	913	boost::system::error_code ec;
913	boost::filesystem::copy_file(p, to / p.leaf(), ec);	914	boost::filesystem::copy_file(p, to / p.filename(), ec);
914	if (ec) {	915	if (ec) {
915	LOGV2_INFO(22814,	916	LOGV2_INFO(22814,
916	"Skipping copying of file from '{from}' to "	917	"Skipping copying of file from '{from}' to "
917	"'{to}' due to: {error}",	918	"'{to}' due to: {error}",
918	"Skipping copying of file due to error"	919	"Skipping copying of file due to error"
919	"from"_attr = p.generic_string(),	920	"from"_attr = p.generic_string(),
920	"to"_attr = (to / p.leaf()).generic_string(),	921	"to"_attr = (to / p.filename()).generic_string(),
921	"error"_attr = ec.message());	922	"error"_attr = ec.message());
922	}	923	}
923	} else if (p.leaf() != "mongod.lock" && p.leaf() != "WiredTiger.lock") {	924	} else if (p.filename() != "mongod.lock" && p.filename() != "WiredTiger.lock") {
924	if (boost::filesystem::is_directory(p)) {	925	if (boost::filesystem::is_directory(p)) {
925	boost::filesystem::path newDir = to / p.leaf();	926	boost::filesystem::path newDir = to / p.filename();
926	boost::filesystem::create_directory(newDir);	927	boost::filesystem::create_directory(newDir);
927	copyDir(p, newDir);	928	copyDir(p, newDir);
928	} else {	929	} else {
929	boost::filesystem::copy_file(p, to / p.leaf());	930	boost::filesystem::copy_file(p, to / p.filename());
930	}	931	}
931	}	932	}
932	++i;	933	++i;
933	-- a/src/mongo/scripting/engine.cpp 2024-02-13 00:46:45.000000000 -0800	934	++ b/src/mongo/scripting/engine.cpp 2024-06-05 00:59:57.488909335 -0700
Lines 34-39 Link Here
34	#include "mongo/scripting/engine.h"	34	#include "mongo/scripting/engine.h"
35		35
36	#include <boost/filesystem/operations.hpp>	36	#include <boost/filesystem/operations.hpp>
		37	#include <boost/filesystem/directory.hpp>
37	#include <cctype>	38	#include <cctype>
38		39
39	#include "mongo/client/dbclient_base.h"	40	#include "mongo/client/dbclient_base.h"
40	-- a/src/mongo/shell/shell_utils_launcher.h 2024-02-13 00:46:45.000000000 -0800	41	++ b/src/mongo/shell/shell_utils_launcher.h 2024-06-05 01:04:44.286162623 -0700
Lines 29-35 Link Here
29		29
30	#pragma once	30	#pragma once
31		31
32	#include <boost/filesystem/convenience.hpp>	32	#include <boost/filesystem/path.hpp>
33	#include <map>	33	#include <map>
34	#include <sstream>	34	#include <sstream>
35	#include <string>	35	#include <string>