summaryrefslogtreecommitdiff
path: root/src/mongo/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/util')
-rw-r--r--src/mongo/util/background.cpp2
-rw-r--r--src/mongo/util/net/listen.cpp2
-rw-r--r--src/mongo/util/options_parser/environment.cpp2
-rw-r--r--src/mongo/util/options_parser/environment_test.cpp18
-rw-r--r--src/mongo/util/options_parser/option_section.cpp8
-rw-r--r--src/mongo/util/options_parser/options_parser.cpp4
-rw-r--r--src/mongo/util/options_parser/options_parser_test.cpp4
-rw-r--r--src/mongo/util/signal_handlers_synchronous.cpp11
8 files changed, 27 insertions, 24 deletions
diff --git a/src/mongo/util/background.cpp b/src/mongo/util/background.cpp
index 47a01afaf86..7c0575daa46 100644
--- a/src/mongo/util/background.cpp
+++ b/src/mongo/util/background.cpp
@@ -262,7 +262,7 @@ Status PeriodicTask::stopRunningPeriodicTasks(int gracePeriodMillis) {
if (runnerDestroyed || !runner)
return status;
- runner->cancel();
+ runner->cancel().transitional_ignore();
status = runner->stop(gracePeriodMillis);
if (status.isOK()) {
diff --git a/src/mongo/util/net/listen.cpp b/src/mongo/util/net/listen.cpp
index 9d04059a743..7be61a420ee 100644
--- a/src/mongo/util/net/listen.cpp
+++ b/src/mongo/util/net/listen.cpp
@@ -649,7 +649,7 @@ void Listener::checkTicketNumbers() {
log() << " --maxConns too high, can only handle " << want;
}
}
- globalTicketHolder.resize(want);
+ globalTicketHolder.resize(want).transitional_ignore();
}
void Listener::shutdown() {
diff --git a/src/mongo/util/options_parser/environment.cpp b/src/mongo/util/options_parser/environment.cpp
index 1b54a96ee22..021fedec677 100644
--- a/src/mongo/util/options_parser/environment.cpp
+++ b/src/mongo/util/options_parser/environment.cpp
@@ -310,7 +310,7 @@ Status valueMapToBSON(const std::map<Key, Value>& params,
// Use the section name in our object builder, and recursively call
// valueMapToBSON with our sub map with keys that have the section name removed.
BSONObjBuilder sectionObjBuilder(builder->subobjStart(sectionName));
- valueMapToBSON(sectionMap, &sectionObjBuilder, sectionName);
+ valueMapToBSON(sectionMap, &sectionObjBuilder, sectionName).transitional_ignore();
sectionObjBuilder.done();
// Our iterator is currently on the last field that matched our dot and prefix, so
diff --git a/src/mongo/util/options_parser/environment_test.cpp b/src/mongo/util/options_parser/environment_test.cpp
index 79764b382fa..01a8324ad7c 100644
--- a/src/mongo/util/options_parser/environment_test.cpp
+++ b/src/mongo/util/options_parser/environment_test.cpp
@@ -46,7 +46,7 @@ TEST(Environment, EmptyValue) {
TEST(Environment, Immutable) {
moe::Environment environment;
moe::ImmutableKeyConstraint immutableKeyConstraint(moe::Key("port"));
- environment.addKeyConstraint(&immutableKeyConstraint);
+ environment.addKeyConstraint(&immutableKeyConstraint).transitional_ignore();
ASSERT_OK(environment.set(moe::Key("port"), moe::Value(5)));
ASSERT_OK(environment.validate());
ASSERT_NOT_OK(environment.set(moe::Key("port"), moe::Value(0)));
@@ -55,7 +55,7 @@ TEST(Environment, Immutable) {
TEST(Environment, OutOfRange) {
moe::Environment environment;
moe::NumericKeyConstraint numericKeyConstraint(moe::Key("port"), 1000, 65535);
- environment.addKeyConstraint(&numericKeyConstraint);
+ environment.addKeyConstraint(&numericKeyConstraint).transitional_ignore();
ASSERT_OK(environment.validate());
ASSERT_NOT_OK(environment.set(moe::Key("port"), moe::Value(0)));
}
@@ -63,7 +63,7 @@ TEST(Environment, OutOfRange) {
TEST(Environment, NonNumericRangeConstraint) {
moe::Environment environment;
moe::NumericKeyConstraint numericKeyConstraint(moe::Key("port"), 1000, 65535);
- environment.addKeyConstraint(&numericKeyConstraint);
+ environment.addKeyConstraint(&numericKeyConstraint).transitional_ignore();
ASSERT_OK(environment.validate());
ASSERT_NOT_OK(environment.set(moe::Key("port"), moe::Value("string")));
}
@@ -71,7 +71,7 @@ TEST(Environment, NonNumericRangeConstraint) {
TEST(Environment, BadType) {
moe::Environment environment;
moe::TypeKeyConstraint<int> typeKeyConstraintInt(moe::Key("port"));
- environment.addKeyConstraint(&typeKeyConstraintInt);
+ environment.addKeyConstraint(&typeKeyConstraintInt).transitional_ignore();
ASSERT_OK(environment.set(moe::Key("port"), moe::Value("string")));
ASSERT_NOT_OK(environment.validate());
}
@@ -79,9 +79,9 @@ TEST(Environment, BadType) {
TEST(Environment, AllowNumeric) {
moe::Environment environment;
moe::TypeKeyConstraint<long> typeKeyConstraintLong(moe::Key("port"));
- environment.addKeyConstraint(&typeKeyConstraintLong);
+ environment.addKeyConstraint(&typeKeyConstraintLong).transitional_ignore();
moe::TypeKeyConstraint<int> typeKeyConstraintInt(moe::Key("port"));
- environment.addKeyConstraint(&typeKeyConstraintInt);
+ environment.addKeyConstraint(&typeKeyConstraintInt).transitional_ignore();
ASSERT_OK(environment.set(moe::Key("port"), moe::Value(1)));
ASSERT_OK(environment.validate());
}
@@ -89,7 +89,7 @@ TEST(Environment, AllowNumeric) {
TEST(Environment, MutuallyExclusive) {
moe::Environment environment;
moe::MutuallyExclusiveKeyConstraint constraint(moe::Key("key"), moe::Key("otherKey"));
- environment.addKeyConstraint(&constraint);
+ environment.addKeyConstraint(&constraint).transitional_ignore();
ASSERT_OK(environment.set(moe::Key("key"), moe::Value(1)));
ASSERT_OK(environment.set(moe::Key("otherKey"), moe::Value(1)));
ASSERT_NOT_OK(environment.validate());
@@ -98,7 +98,7 @@ TEST(Environment, MutuallyExclusive) {
TEST(Environment, RequiresOther) {
moe::Environment environment;
moe::RequiresOtherKeyConstraint constraint(moe::Key("key"), moe::Key("otherKey"));
- environment.addKeyConstraint(&constraint);
+ environment.addKeyConstraint(&constraint).transitional_ignore();
ASSERT_OK(environment.set(moe::Key("key"), moe::Value(1)));
ASSERT_NOT_OK(environment.validate());
ASSERT_OK(environment.set(moe::Key("otherKey"), moe::Value(1)));
@@ -108,7 +108,7 @@ TEST(Environment, RequiresOther) {
TEST(Environment, StringFormat) {
moe::Environment environment;
moe::StringFormatKeyConstraint constraint(moe::Key("key"), "[0-9]", "[0-9]");
- environment.addKeyConstraint(&constraint);
+ environment.addKeyConstraint(&constraint).transitional_ignore();
ASSERT_OK(environment.set(moe::Key("key"), moe::Value(1)));
ASSERT_NOT_OK(environment.validate());
ASSERT_OK(environment.set(moe::Key("key"), moe::Value(std::string("a"))));
diff --git a/src/mongo/util/options_parser/option_section.cpp b/src/mongo/util/options_parser/option_section.cpp
index b49902508af..904bf5e284f 100644
--- a/src/mongo/util/options_parser/option_section.cpp
+++ b/src/mongo/util/options_parser/option_section.cpp
@@ -474,7 +474,7 @@ Status OptionSection::getAllOptions(std::vector<OptionDescription>* options) con
std::list<OptionSection>::const_iterator ositerator;
for (ositerator = _subSections.begin(); ositerator != _subSections.end(); ositerator++) {
- ositerator->getAllOptions(options);
+ ositerator->getAllOptions(options).transitional_ignore();
}
return Status::OK();
@@ -490,7 +490,7 @@ Status OptionSection::getDefaults(std::map<Key, Value>* values) const {
std::list<OptionSection>::const_iterator ositerator;
for (ositerator = _subSections.begin(); ositerator != _subSections.end(); ositerator++) {
- ositerator->getDefaults(values);
+ ositerator->getDefaults(values).transitional_ignore();
}
return Status::OK();
@@ -511,7 +511,7 @@ Status OptionSection::countOptions(int* numOptions, bool visibleOnly, OptionSour
std::list<OptionSection>::const_iterator ositerator;
for (ositerator = _subSections.begin(); ositerator != _subSections.end(); ositerator++) {
int numSubOptions = 0;
- ositerator->countOptions(&numSubOptions, visibleOnly, sources);
+ ositerator->countOptions(&numSubOptions, visibleOnly, sources).transitional_ignore();
*numOptions += numSubOptions;
}
@@ -531,7 +531,7 @@ Status OptionSection::getConstraints(std::vector<std::shared_ptr<Constraint>>* c
std::list<OptionSection>::const_iterator ositerator;
for (ositerator = _subSections.begin(); ositerator != _subSections.end(); ositerator++) {
- ositerator->getConstraints(constraints);
+ ositerator->getConstraints(constraints).transitional_ignore();
}
return Status::OK();
diff --git a/src/mongo/util/options_parser/options_parser.cpp b/src/mongo/util/options_parser/options_parser.cpp
index 5d03910a390..11fe6ec1434 100644
--- a/src/mongo/util/options_parser/options_parser.cpp
+++ b/src/mongo/util/options_parser/options_parser.cpp
@@ -416,7 +416,7 @@ Status addBoostVariablesToEnvironment(const po::variables_map& vm,
optionValue = Value(mapValue);
}
- environment->set(iterator->_dottedName, optionValue);
+ environment->set(iterator->_dottedName, optionValue).transitional_ignore();
}
}
return Status::OK();
@@ -605,7 +605,7 @@ Status addConstraints(const OptionSection& options, Environment* dest) {
std::vector<std::shared_ptr<Constraint>>::const_iterator citerator;
for (citerator = constraints_vector.begin(); citerator != constraints_vector.end();
citerator++) {
- dest->addConstraint(citerator->get());
+ dest->addConstraint(citerator->get()).transitional_ignore();
}
return Status::OK();
diff --git a/src/mongo/util/options_parser/options_parser_test.cpp b/src/mongo/util/options_parser/options_parser_test.cpp
index a0d97c512bb..bf8fb873be5 100644
--- a/src/mongo/util/options_parser/options_parser_test.cpp
+++ b/src/mongo/util/options_parser/options_parser_test.cpp
@@ -302,7 +302,7 @@ TEST(Parsing, SubSection) {
moe::OptionSection subSection("Section Name");
subSection.addOptionChaining("port", "port", moe::Int, "Port");
- testOpts.addSection(subSection);
+ testOpts.addSection(subSection).transitional_ignore();
std::vector<std::string> argv;
argv.push_back("binaryname");
@@ -4020,7 +4020,7 @@ TEST(OptionCount, Basic) {
moe::OptionSection subSection("Section Name");
subSection.addOptionChaining("port", "port", moe::Int, "Port")
.setSources(moe::SourceYAMLConfig);
- testOpts.addSection(subSection);
+ testOpts.addSection(subSection).transitional_ignore();
int numOptions;
ASSERT_OK(testOpts.countOptions(&numOptions, true /*visibleOnly*/, moe::SourceCommandLine));
diff --git a/src/mongo/util/signal_handlers_synchronous.cpp b/src/mongo/util/signal_handlers_synchronous.cpp
index e9422155a4f..e05463743fb 100644
--- a/src/mongo/util/signal_handlers_synchronous.cpp
+++ b/src/mongo/util/signal_handlers_synchronous.cpp
@@ -165,10 +165,13 @@ int MallocFreeOStreamGuard::terminateDepth = 0;
// must hold MallocFreeOStreamGuard to call
void writeMallocFreeStreamToLog() {
- logger::globalLogDomain()->append(
- logger::MessageEventEphemeral(
- Date_t::now(), logger::LogSeverity::Severe(), getThreadName(), mallocFreeOStream.str())
- .setIsTruncatable(false));
+ logger::globalLogDomain()
+ ->append(logger::MessageEventEphemeral(Date_t::now(),
+ logger::LogSeverity::Severe(),
+ getThreadName(),
+ mallocFreeOStream.str())
+ .setIsTruncatable(false))
+ .transitional_ignore();
mallocFreeOStream.rewind();
}
View Lorry Controller Status