You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ti...@apache.org on 2016/10/07 13:16:08 UTC
[1/2] mesos git commit: Made `FlagsBase::extract` publicly accessible.
Repository: mesos
Updated Branches:
refs/heads/master 8ad489f90 -> acbebcc6f
Made `FlagsBase::extract` publicly accessible.
This function contains important business logic on how environment
variables are interpreted (keys are largely case-insensitive, and
duplicates are dropped in a certain order). Make this function
`public` so users interested in seeing what environment variables
`Flags` would see are not tempted to reimplement it (likely
incompletely or incorrectly).
Review: https://reviews.apache.org/r/52256/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/677faaf5
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/677faaf5
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/677faaf5
Branch: refs/heads/master
Commit: 677faaf5d99d3c9a953a62df71ee82b359ecb330
Parents: 8ad489f
Author: Benjamin Bannier <be...@mesosphere.io>
Authored: Fri Oct 7 14:56:54 2016 +0200
Committer: Till Toenshoff <to...@me.com>
Committed: Fri Oct 7 14:56:54 2016 +0200
----------------------------------------------------------------------
3rdparty/stout/include/stout/flags/flags.hpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/677faaf5/3rdparty/stout/include/stout/flags/flags.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/flags/flags.hpp b/3rdparty/stout/include/stout/flags/flags.hpp
index eab8a00..794a598 100644
--- a/3rdparty/stout/include/stout/flags/flags.hpp
+++ b/3rdparty/stout/include/stout/flags/flags.hpp
@@ -371,6 +371,10 @@ public:
// do when the user asks for help.
bool help;
+ // Extract environment variable "flags" with the specified prefix.
+ std::map<std::string, Option<std::string>> extract(
+ const std::string& prefix) const;
+
protected:
// The program's name, extracted from argv[0] by default;
// declared 'protected' so that derived classes can alter this
@@ -384,9 +388,6 @@ protected:
Option<std::string> usageMessage_;
private:
- // Extract environment variable "flags" with the specified prefix.
- std::map<std::string, Option<std::string>> extract(const std::string& prefix);
-
Try<Warnings> load(
Multimap<std::string, Option<std::string>>& values,
bool unknowns = false,
@@ -725,7 +726,7 @@ inline void FlagsBase::add(const Flag& flag)
// Extract environment variable "flags" with the specified prefix.
inline std::map<std::string, Option<std::string>> FlagsBase::extract(
- const std::string& prefix)
+ const std::string& prefix) const
{
std::map<std::string, Option<std::string>> values;
[2/2] mesos git commit: Avoided modifying process environment.
Posted by ti...@apache.org.
Avoided modifying process environment.
This code modified the process environment in order to support upgrading
on the fly from old-style libprocess SSL variables \`SSL\_\` to
\`LIBPROCESS_SSL\_\`. Modifying the process environment at this point is
not safe as other actors might concurrently read out that same
environment.
Instead avoid changing the process environment altogether since flags
can just as well be read from a map.
Review: https://reviews.apache.org/r/52154/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/acbebcc6
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/acbebcc6
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/acbebcc6
Branch: refs/heads/master
Commit: acbebcc6f13d75956022f849ef93955fdfb33f4c
Parents: 677faaf
Author: Benjamin Bannier <be...@mesosphere.io>
Authored: Fri Oct 7 14:56:59 2016 +0200
Committer: Till Toenshoff <to...@me.com>
Committed: Fri Oct 7 14:56:59 2016 +0200
----------------------------------------------------------------------
3rdparty/libprocess/src/openssl.cpp | 40 +++++++++++++++++---------------
1 file changed, 21 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/acbebcc6/3rdparty/libprocess/src/openssl.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/openssl.cpp b/3rdparty/libprocess/src/openssl.cpp
index d73abbd..5ddb10d 100644
--- a/3rdparty/libprocess/src/openssl.cpp
+++ b/3rdparty/libprocess/src/openssl.cpp
@@ -297,24 +297,24 @@ void reinitialize()
// environment. See comment at top of openssl.hpp for a full list.
//
// NOTE: We used to look for environment variables prefixed by SSL_.
- // To be backward compatible, for each environment variable prefixed
- // by SSL_, we generate the corresponding LIBPROCESS_SSL_ version.
- // See details in MESOS-5863.
- map<string, string> environments = os::environment();
- foreachpair (const string& key, const string& value, environments) {
- if (strings::startsWith(key, "SSL_")) {
- const string new_key = "LIBPROCESS_" + key;
- if (environments.count(new_key) == 0) {
- os::setenv(new_key, value);
- } else if (environments[new_key] != value) {
- LOG(WARNING) << "Mismatched SSL environment variables: "
- << key << "=" << value << ", "
- << new_key << "=" << environments[new_key];
- }
+ // To be backward compatible, we interpret environment variables
+ // prefixed with either SSL_ and LIBPROCESS_SSL_ where the latter
+ // one takes precedence. See details in MESOS-5863.
+ map<string, Option<string>> environment_ssl =
+ ssl_flags->extract("SSL_");
+ map<string, Option<string>> environments =
+ ssl_flags->extract("LIBPROCESS_SSL_");
+ foreachpair (
+ const string& key, const Option<string>& value, environment_ssl) {
+ if (environments.count(key) > 0 && environments.at(key) != value) {
+ LOG(WARNING) << "Mismatched values for SSL environment variables "
+ << "SSL_" << key << " and "
+ << "LIBPROCESS_SSL_" << key;
}
}
+ environments.insert(environment_ssl.begin(), environment_ssl.begin());
- Try<flags::Warnings> load = ssl_flags->load("LIBPROCESS_SSL_");
+ Try<flags::Warnings> load = ssl_flags->load(environments);
if (load.isError()) {
EXIT(EXIT_FAILURE)
<< "Failed to load flags from environment variables "
@@ -489,16 +489,18 @@ void reinitialize()
// defaults.
string ca_dir;
- if (environments.count(X509_get_default_cert_dir_env()) > 0) {
- ca_dir = environments.at(X509_get_default_cert_dir_env());
+ const map<string, string> environment = os::environment();
+
+ if (environment.count(X509_get_default_cert_dir_env()) > 0) {
+ ca_dir = environment.at(X509_get_default_cert_dir_env());
} else {
ca_dir = X509_get_default_cert_dir();
}
string ca_file;
- if (environments.count(X509_get_default_cert_file_env()) > 0) {
- ca_file = environments.at(X509_get_default_cert_file_env());
+ if (environment.count(X509_get_default_cert_file_env()) > 0) {
+ ca_file = environment.at(X509_get_default_cert_file_env());
} else {
ca_file = X509_get_default_cert_file();
}